fix bug of install, Fixed #24, thx William-Sang

Author: wklken

install.sh

@@ -1,48 +1,46 @@
 #!/bin/bash
 
 # refer  spf13-vim bootstrap.sh`
-
 BASEDIR=$(dirname $0)
 cd $BASEDIR
 CURRENT_DIR=`pwd`
 
 lnif() {
-    if [ ! -e $2 ] ; then
-        ln -s $1 $2
-    fi
-    if [ -L $2 ] ; then
-        ln -sf $1 $2
+    if [ -e "$1" ]; then
+        ln -sf "$1" "$2"
     fi
 }
 
-echo "backing up current vim config"
+echo "Step1: backing up current vim config"
 today=`date +%Y%m%d`
 for i in $HOME/.vim $HOME/.vimrc $HOME/.gvimrc; do [ -e $i ] && [ ! -L $i ] && mv $i $i.$today; done
 for i in $HOME/.vim $HOME/.vimrc $HOME/.gvimrc; do [ -L $i ] && unlink $i ; done
 
 
-echo "setting up symlinks"
+echo "Step2: setting up symlinks"
 lnif $CURRENT_DIR/vimrc $HOME/.vimrc
 lnif $CURRENT_DIR/vimrc.bundles $HOME/.vimrc.bundles
-lnif $CURRENT_DIR/ $HOME/.vim
-
+lnif "$CURRENT_DIR/" "$HOME/.vim"
 
-if [ ! -e $CURRENT_DIR/vundle ]; then
+echo "Step3: install vundle"
+if [ ! -e $CURRENT_DIR/bundle/vundle ]; then
     echo "Installing Vundle"
     git clone https://github.com/gmarik/vundle.git $CURRENT_DIR/bundle/vundle
+else
+    echo "Upgrade Vundle"
+    cd "$HOME/.vim/bundle/vundle" && git pull origin master
 fi
 
-
-echo "update/install plugins using Vundle"
+echo "Step4: update/install plugins using Vundle"
 system_shell=$SHELL
 export SHELL="/bin/sh"
-vim -u $CURRENT_DIR/vimrc +BundleInstall! +BundleClean +qall
+vim -u $HOME/.vimrc.bundles +BundleInstall! +BundleClean +qall
 export SHELL=$system_shell
 
 
-
-echo "compile YouCompleteMe"
-echo "if error,you need to compile it yourself"
+echo "Step5: compile YouCompleteMe"
+echo "It will take a long time, juse be patient!"
+echo "If error,you need to compile it yourself"
 echo "cd $CURRENT_DIR/bundle/YouCompleteMe/ && bash -x install.sh --clang-completer"
 cd $CURRENT_DIR/bundle/YouCompleteMe/
 bash -x install.sh --clang-completer
@@ -57,3 +55,5 @@ if [ ! -d /tmp/vimundo ]
 then
     mkdir -p /tmp/vimundo
 fi
+
+echo "Install Done!"

vimrc

@@ -30,11 +30,6 @@ let g:mapleader = ','
 " 开启语法高亮
 syntax enable
 
-" configure Vundle
-filetype on " without this vim emits a zero exit status, later, because of :ft off
-filetype off " required! turn off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
 
 " install Vundle bundles
 if filereadable(expand("~/.vimrc.bundles"))
@@ -64,8 +59,6 @@ filetype plugin on
 "启动自动补全
 filetype plugin indent on
 
-"非兼容vi模式。去掉讨厌的有关vi一致性模式，避免以前版本的一些bug和局限
-set nocompatible
 set autoread          " 文件修改之后自动载入。
 set shortmess=atI       " 启动的时候不显示那个援助索马里儿童的提示
 
@@ -479,8 +472,8 @@ if has("gui_running")
 endif
 
 " theme主题
-colorscheme solarized
 set background=dark
+colorscheme solarized
 set t_Co=256
 
 "colorscheme molokai

vimrc.bundles

@@ -6,6 +6,14 @@
 "################### 包依赖 #####################
 "package dependence:  ctags
 "python dependence:  pep8, pyflake
+"
+"非兼容vi模式。去掉讨厌的有关vi一致性模式，避免以前版本的一些bug和局限
+set nocompatible
+" configure Vundle
+filetype off " required! turn off
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
 
 "################### 插件管理 ###################
 
@@ -91,11 +99,11 @@ Bundle 'Lokaltog/vim-easymotion'
 
 Bundle 'vim-scripts/matchit.zip'
 
-" 显示marks
+" 显示marks 还有bug
 " m[a-zA-Z] add mark
 " '[a-zA-Z] go to mark
 " m<Space>  del all marks
-Bundle "kshenoy/vim-signature"
+" Bundle "kshenoy/vim-signature"
 
 
 "################### 快速选中 ###################