Fix setup.sh: typos and such

This commit is contained in:
Eryn Wells 2013-09-04 14:03:45 -07:00
parent ae88174526
commit a11db44f43

View file

@ -1,4 +1,4 @@
#!/bin/zsh #!/usr/bin/env zsh
dfdir=$(cd "$(dirname "$0")" && pwd) dfdir=$(cd "$(dirname "$0")" && pwd)
sys=`uname -s | tr A-Z a-z` sys=`uname -s | tr A-Z a-z`
@ -12,36 +12,35 @@ typeset -A vimbundles
# blackboard "https://github.com/nelstrom/vim-blackboard.git" \ # blackboard "https://github.com/nelstrom/vim-blackboard.git" \
# fugitive "https://github.com/tpope/vim-fugitive.git" \ # fugitive "https://github.com/tpope/vim-fugitive.git" \
vimbundles=( \ vimbundles=( \
command-t "https://github.com/wincent/Command-T.git" \ command-t "https://github.com/wincent/Command-T.git" \
dash "https://github.com/rizzatti/dash.vim.git" dash "https://github.com/rizzatti/dash.vim.git"
funcoo "https://github.com/rizzatti/funcoo.vim.git" \ funcoo "https://github.com/rizzatti/funcoo.vim.git" \
gundo "https://github.com/sjl/gundo.vim.git" \ gundo "https://github.com/sjl/gundo.vim.git" \
mw-utils "https://github.com/MarcWeber/vim-addon-mw-utils.git" \ mw-utils "https://github.com/MarcWeber/vim-addon-mw-utils.git" \
repeat "https://github.com/tpope/vim-repeat" \ repeat "https://github.com/tpope/vim-repeat" \
snipmate "https://github.com/garbas/vim-snipmate.git" \ snipmate "https://github.com/garbas/vim-snipmate.git" \
snipmate-snippets "https://github.com/honza/snipmate-snippets.git" \ snipmate-snippets "https://github.com/honza/vim-snippets.git" \
snipmate-zope "https://github.com/zedr/zope-snipmate-bundle.git" \ snipmate-zope "https://github.com/zedr/zope-snipmate-bundle.git" \
solarized "https://github.com/altercation/vim-colors-solarized.git" \ solarized "https://github.com/altercation/vim-colors-solarized.git" \
speeddating "https://github.com/tpope/vim-speeddating.git" \ speeddating "https://github.com/tpope/vim-speeddating.git" \
surround "https://github.com/tpope/vim-surround.git" \ surround "https://github.com/tpope/vim-surround.git" \
tlib "https://github.com/tomtom/tlib_vim.git" \ tlib "https://github.com/tomtom/tlib_vim.git" \
unimpaired "https://github.com/tpope/vim-unimpaired.git" \ unimpaired "https://github.com/tpope/vim-unimpaired.git" \
) )
if [[ ! -d ~/.oh-my-zsh ]]; then #if [[ ! -d ~/.oh-my-zsh ]]; then
print -P "%BCloning Oh my ZSH!" # print -P "%BCloning Oh my ZSH!"
git clone $omzrepo $HOME/.oh-my-zsh # git clone $omzrepo $HOME/.oh-my-zsh
fi #fi
print -P "%BSymlinking config files%b" print -P "%BSymlinking config files%b"
for dotfile in `ls $dfdir` for dotfile in `ls $dfdir`; do
do
# metafiles; don't link them # metafiles; don't link them
[[ $dotfile = 'setup.sh' ]] && continue [[ $dotfile = 'setup.sh' ]] && continue
[[ $dotfile = 'README.md' ]] && continue [[ $dotfile = 'README.md' ]] && continue
local dest="$HOME/.$dotfile" local dest="$HOME/.$dotfile"
if [[! -L "$dest" ]]; then if [[ ! -L "$dest" ]]; then
action='Linking' action='Linking'
ln -fs "$dfdir/$dotfile" "$dest" ln -fs "$dfdir/$dotfile" "$dest"
else else
@ -59,8 +58,8 @@ cd "$dfdir/vim/bundle"
for module in ${(k)vimbundles}; do for module in ${(k)vimbundles}; do
echo -n " $module" echo -n " $module"
if [ -d $module ]; then if [[ -d $module ]]; then
result='skipped' # result='skipped'
else else
git clone ${vimbundles[$module]} $module 1>/dev/null 2>&1 git clone ${vimbundles[$module]} $module 1>/dev/null 2>&1
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then