From d947e6d70271873d37bab37e357505c5b0d01bf3 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté <mikisabate@gmail.com>
Date: Fri, 14 Nov 2014 18:31:09 +0100
Subject: vim: updated vundle -> Vundle.vim.

---
 .gitmodules           |  6 +++---
 install.sh            | 10 +---------
 vim/bundle/Vundle.vim |  1 +
 vim/bundle/vundle     |  1 -
 vim/bundles.vim       | 17 ++++++++++-------
 5 files changed, 15 insertions(+), 20 deletions(-)
 create mode 160000 vim/bundle/Vundle.vim
 delete mode 160000 vim/bundle/vundle

diff --git a/.gitmodules b/.gitmodules
index 8e7bc95..aec4ca9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "vim/bundle/vundle"]
-	path = vim/bundle/vundle
-	url = https://github.com/gmarik/vundle.git
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/gmarik/Vundle.vim.git
diff --git a/install.sh b/install.sh
index c91807a..edb5a0f 100755
--- a/install.sh
+++ b/install.sh
@@ -30,15 +30,7 @@ rm -rf $HOME/.vim
 rm -rf $HOME/.vimrc
 cp -rf vim $HOME/.vim
 cp vimrc $HOME/.vimrc
-cat <<HERE
-
-You have successfully installed my vim configuration files. However, you have
-to type the following command inside vim to install all the plugins that I'm
-using:
-
-  :BundleInstall
-
-HERE
+vim +PluginInstall +qall
 
 # Download and install the g utility
 cd /tmp
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
new file mode 160000
index 0000000..0b28e33
--- /dev/null
+++ b/vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
deleted file mode 160000
index f31aa52..0000000
--- a/vim/bundle/vundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e
diff --git a/vim/bundles.vim b/vim/bundles.vim
index 5e60959..2affba0 100644
--- a/vim/bundles.vim
+++ b/vim/bundles.vim
@@ -1,14 +1,17 @@
 
 " Vundle setup
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-Bundle 'gmarik/vundle'
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'gmarik/Vundle.vim'
 
 " My list of plugins.
-Bundle 'tpope/vim-surround.git'
-Bundle 'kien/ctrlp.vim.git'
-Bundle 'derekwyatt/vim-scala.git'
-Bundle 'fatih/vim-go'
+Plugin 'tpope/vim-surround.git'
+Plugin 'kien/ctrlp.vim.git'
+Plugin 'derekwyatt/vim-scala.git'
+Plugin 'fatih/vim-go'
+
+call vundle#end()
 
 ""
 " Some small adjustments for the installed plugins.
-- 
cgit v1.2.3