From 03830987aff841b52611b0b21d9c621c14e7ac50 Mon Sep 17 00:00:00 2001 From: Adam Veldhousen Date: Fri, 3 Jun 2016 16:03:25 -0500 Subject: [PATCH] bootstrap.sh cleans up after itself a bit better --- bootstrap.sh | 28 ++++++++++++++++++++-------- brew.sh | 6 ++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index e0b4517..70b6133 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -51,7 +51,7 @@ fi echo "" # a check to see if they're using a config file and if it has a host setup -if [[ -f "${dest}/.ssh/config" && -z $(cat "${dest}/.ssh/config" | grep "[hH]ost \*")]]; then +if [[ -f "${dest}/.ssh/config" && -z $(cat "${dest}/.ssh/config" | grep "[hH]ost \*") ]]; then echo "Appending ssh config" # we append it so we don't destroy any custom settings they may have cat "${source}/.ssh/config" >> "${dest}/.ssh/config" @@ -64,7 +64,7 @@ fi if [[ $(uname -s) == "Darwin" ]]; then echo "running .osx file" - ./.osx + sudo ./.osx echo "installing brew" ./brew.sh fi @@ -72,12 +72,24 @@ fi echo "" echo "Cleaning up..." -rm -rf ${dest}/.git -rm -rf ${dest}/.gitmodules -rm -rf ${dest}/.gitignore -rm -rf ${dest}/bootstrap.sh -rm -rf ${dest}/remove.sh -rm -rf ${dest}/README.md +cleanup=".git +.gitmodules +.gitignore +bootstrap.sh +remove.sh +README.md +.osx +brew.sh" + + +for f in ${cleanup} +do + filetorm = ${dest}/${f} + if [[ -f ${filetorm} ]]; then + rm -rf $filetorm + fi +done + popd 2&> /dev/null echo "To uninstall, do cd ./lauging-hipster && ./remove.sh" diff --git a/brew.sh b/brew.sh index ffb2303..60fe27f 100755 --- a/brew.sh +++ b/brew.sh @@ -10,6 +10,7 @@ brew update && brew install \ docker-machine \ git \ gnupg \ + mono \ nvm \ openssl \ python \ @@ -26,3 +27,8 @@ rbenv install 1.9.3-p125; rbenv global 1.9.3-p125; brew install macvim --override-system-vim --with-lua --with-python; + +rake + +~/tools/vim/bundle/YouCompleteMe/install.py --all +