Merge pull request #87 from TTWShell/fix/brew-use

Fix/brew use

Author: TTWShell

.travis.yml

@@ -6,6 +6,9 @@ os:
   - linux
   - osx
 
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+
 install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y clang golang; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-4.9" CC="gcc-4.9" GOROOT="/usr/lib/go" GOPATH=$HOME/gocode PATH=$PATH:$GOPATH/bin; fi

install-plugins.sh

@@ -3,32 +3,32 @@
 function install {
     ln -s -f `pwd`/vimrc  $HOME/.vimrc
     touch $HOME/.vimrc.local
-    yes "\n" | sudo vim +PluginClean +qall
-    yes "\n" | sudo vim +PluginInstall +qall
+    yes "" | vim +PluginClean +qall
+    yes "" | vim +PluginInstall +qall
 }
 
 function update {
-    yes "\n" | sudo vim +PluginUpdate +qall
+    yes "" | vim +PluginUpdate +qall
 }
 
 function init {
     echo ">>> Set up Vundle ..."
-    sudo rm -rf ~/.vim/bundle/Vundle.vim
-    sudo git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
+    rm -rf ~/.vim/bundle/Vundle.vim
+    git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
     pip install flake8  # for vim-flake8
 
     install
 
-    sudo mkdir -p ~/.vim/colors && sudo cp ~/.vim/bundle/vim-colorschemes/colors/* ~/.vim/colors
+    mkdir -p ~/.vim/colors && cp ~/.vim/bundle/vim-colorschemes/colors/* ~/.vim/colors
 
     rebuild --gocode-completer
 }
 
 function rebuild() {
     set -e
     set -o pipefail
-    cd ~/.vim/bundle/YouCompleteMe && git submodule update --init --recursive && sudo ./install.py "$@"
+    cd ~/.vim/bundle/YouCompleteMe && git submodule update --init --recursive && ./install.py "$@"
 }
 
 function usage {

install.sh

@@ -54,6 +54,6 @@ case $platform in
         ;;
 esac
 
-sudo bash install-plugins.sh init
+bash install-plugins.sh init
 
 echoo "Install finished. If you need orther language support, please run: ./install-plugins.sh --help"

scripts/init-vim-osx.sh

@@ -5,10 +5,10 @@ function echoo {
 }
 
 echoo ">>> Install cmake using brew ..."
-brew install cmake
+brew list cmake &>/dev/null || brew install cmake
 
 echoo ">>> Install golang using brew ..."
-brew install golang
+brew list golang &>/dev/null || brew install golang
 
 echoo ">>> Install vim using brew ..."
-brew install vim
+brew list vim &>/dev/null || brew install vim