Merge branch 'master' of github.com:joshtronic/dotfiles

Conflicts:
	vim.sh
This commit is contained in:
Josh Sherman 2012-11-18 19:41:53 -05:00
commit c20109c95c
4 changed files with 48 additions and 2 deletions

3
.gitmodules vendored
View file

@ -19,3 +19,6 @@
[submodule "vim/plugins/vim-scripts/Flex-Development-Support"]
path = vim/plugins/vim-scripts/Flex-Development-Support
url = git@github.com:vim-scripts/Flex-Development-Support.git
[submodule "vim/plugins/vim-scripts/SearchComplete"]
path = vim/plugins/vim-scripts/SearchComplete
url = git@github.com:vim-scripts/SearchComplete.git

4
setup
View file

@ -131,8 +131,8 @@ fi
mkdir $DOTVIM
OWNERS=( "ervandew" "msanders" "scrooloose" "scrooloose" "tpope" "vim-scripts" "vim-scripts" )
REPOS=( "supertab" "snipmate.vim" "nerdtree" "syntastic" "vim-fugitive" "Command-T" "Flex-Development-Support" )
OWNERS=( "ervandew" "msanders" "scrooloose" "scrooloose" "tpope" "vim-scripts" "vim-scripts" "vim-scripts" )
REPOS=( "supertab" "snipmate.vim" "nerdtree" "syntastic" "vim-fugitive" "Command-T" "Flex-Development-Support" "SearchComplete" )
for (( i = 0; i < ${#OWNERS[@]}; i++ ))
do

42
vim.sh Executable file
View file

@ -0,0 +1,42 @@
#!/bin/bash
PWD=`pwd`
# Copies .vimrc
if [ -f ~/.vimrc ];
then
rm ~/.vimrc
fi
ln -s $PWD/vimrc ~/.vimrc
# Pulls down and installs vim plugins
DOTVIM=~/.vim
if [ -d $DOTVIM ];
then
rm -r $DOTVIM
fi
mkdir $DOTVIM
echo
OWNERS=( "ervandew" "msanders" "scrooloose" "scrooloose" "tpope" "vim-scripts" "vim-scripts" "vim-scripts" )
REPOS=( "supertab" "snipmate.vim" "nerdtree" "syntastic" "vim-fugitive" "Command-T" "Flex-Development-Support" "SearchComplete" )
for (( i = 0 ; i < ${#OWNERS[@]} ; i++ ))
do
git clone git://github.com/${OWNERS[$i]}/${REPOS[$i]}.git /tmp/${REPOS[$i]}
cp -R /tmp/${REPOS[$i]}/* $DOTVIM
rm -rf /tmp/${REPOS[$i]}
echo
done
# Installs additional syntax files
cp ./less.vim $DOTVIM/syntax
# Finish up Command-T installation
cd $DOTVIM/ruby/command-t
ruby extconf.rb
make

@ -0,0 +1 @@
Subproject commit d85ccf8c6c1fa88feff0c56b8fe271b7d91bd292