From 56dfd20a95a20091afac2cbdb2667d324a288dbd Mon Sep 17 00:00:00 2001 From: Adam Veldhousen Date: Sat, 29 Oct 2016 15:26:50 -0500 Subject: [PATCH] installs vim stuff for osx automatically, windows, not so much --- README.md | 18 +++++++++--------- bootstrap.sh | 9 +++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 01cc7d2..987f7ad 100644 --- a/README.md +++ b/README.md @@ -19,24 +19,24 @@ Tmux and vim configurations ## Install -1. Clone this into ~ -2. cd into laughing-hipster -3. run `./bootstrap.sh` +1. cd into `~` +3. run `laughing-hipster/bootstrap.sh` The installer backs up your current home folder dotfiles into `.home_bkup` and then symlinks in the dotfiles for this repo. The installer also preserves your ssh config if you have customized it already. Because everything is symlinked, all you have to do for most updates is just `git pull`. -## Extending with custom scripts - -This set up will source all files found in a `~/.extensions/` directory or in a file named `~/.extensions` at the last moment. This allows you to extend and customize how everything works to your liking. - ## Uninstall -1. cd into laughing-hipster -2. run `./remove.sh` +1. cd into `~` +2. run `./laughing-hipster/remove.sh` The uninstaller will leave the ssh config in place and copy all of the files from `.home_bkup` into their original places. It will also remove the tools folder and any dot files that have the same name as the ones in this repo. Basically you end up back where you started (or close to) without anything destructive happening. + +## Extending with custom scripts + +This set up will source all files found in a `~/.extensions/` directory or in a file named `~/.extensions` at the last moment. This allows you to extend and customize how everything works to your liking. + diff --git a/bootstrap.sh b/bootstrap.sh index c57ed4d..80e0485 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -72,7 +72,14 @@ if [[ $(uname -s) == "Darwin" ]]; then echo "installing osx stuff" sudo ./install/.osx + + rake + ~/tools/vim/bundle/YouCompleteMe/install.py --all elif [[ $(uname -o) == "Msys" ]]; then + + echo "If you would like to install vim plugins, ensure you have ruby 1.9.3 + rake installed and do the following:" + echo "rake;" + echo "~/tools/vim/bundle/YouCompleteMe/install.py --all;" echo "installing fonts" fonts="$(find ${source}/tools/modules/powerline-fonts | grep "\.[to]tf")" @@ -88,9 +95,7 @@ fi mkdir ~/.extensions -rake -~/tools/vim/bundle/YouCompleteMe/install.py --all echo "" echo "Cleaning up..."