bootstrap vundle in vimrc instead installer

2 files changed, 15 insertions, 2 deletions

diff --git a/install b/install
index d3f0c39..d7bb343 100755
--- a/install
+++ b/install
@@ -121,8 +121,6 @@ function vimConfigInstaller() {
    # link ctags
    type ctags >/dev/null 2>&1 && { echo -e "let \$MYCTAGS='$(which ctags)'" >> $vimrc; }
    echo -e "source $ABS_BASE_DIR/vimrc" >> $vimrc
-   git clone https://github.com/VundleVim/Vundle.vim.git $vim_home/bundle/Vundle.vim &> /dev/null || { echo "Vundle not cloned, using existing!"; }
-   vim +PluginUpdate +qall -c "q"
    return 0
 }
 
diff --git a/vimrc b/vimrc
index 1c659f1..db3682c 100644
--- a/vimrc
+++ b/vimrc
@@ -12,6 +12,17 @@ endif
 nnoremap <leader>ev :edit ~/.vimrc<CR>
 nnoremap <leader>sv :source ~/.vimrc<CR>
 
+"{{{ Vundle bootstrap
+
+let s:needBootstrapVundle=0
+if !filereadable(expand('$VIMHOME/bundle/Vundle.vim/README.md'))
+    echo "Installing Vundle...\n"
+    silent !mkdir -p $VIMHOME/bundle
+    silent !git clone https://github.com/VundleVim/Vundle.vim.git $VIMHOME/bundle/Vundle.vim
+    let s:needBootstrapVundle=1
+endif
+
+"}}}
 "{{{ Plugin Management
 
 " to install plugins open vim and run :PluginInstall from within vim OR
@@ -45,6 +56,10 @@ Plugin 'chriskempson/base16-vim'
 
 call vundle#end()
 
+if s:needBootstrapVundle == 1
+  :PluginUpdate
+endif
+
 "}}}
 "{{{ Plugin Config