From 1a7f0ae4fd4d25ee0dd33e0239e6e4bee1bc03e3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 23 Mar 2013 04:17:34 -0400 Subject: [PATCH] Delegate YCM compile to curled install.sh --- install/vim | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/install/vim b/install/vim index fd344b57..b20ce59c 100755 --- a/install/vim +++ b/install/vim @@ -35,22 +35,16 @@ if [ ! -e ~/.vimrc ]; then rm ~/.vimrc.bundles rm ~/.gvimrc fi - sh <(curl https://raw.github.com/hlissner/mlvim/master/install.sh -L) | indent -fi - -# Installing/updating vim bundles -echo-g "==> Vim: Updating..." -find ~/.vim/bundle/ -type d -name .git \ -| xargs -n 1 dirname \ -| while read line; do cd $line && echo -n "* $(basename $line): " && git pull; done - -# Compiling YouCompleteMe -YVM_DIR="~/.vim/bundle/YouCompleteMe" -if [ -d $YVM_DIR ] && [ ! -e $YVM_DIR/python/ycm_core.so ]; then - echo-g "==> Vim: Trying to compile YCM" - pkg-install cmake - cd ~/.vim/bundle/YouCompleteMe - ./install.sh --clang-completer + if is_deb; then + pkg-install cmake + fi + sh <(curl https://raw.github.com/hlissner/mlvim/master/install.sh -L) +else + # Installing/updating vim bundles + echo-g "==> Vim: Updating..." + find ~/.vim/bundle/ -type d -name .git \ + | xargs -n 1 dirname \ + | while read line; do cd $line && echo -n "* $(basename $line): " && git pull; done fi echo-g "==> Vim: DONE!"