From 8bdf7a3459ca8345d6a2ac4a0f7951c85a226c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 16 Apr 2012 11:25:31 +0200 Subject: install swallows update --- install | 14 ++++++++++---- update | 7 ------- 2 files changed, 10 insertions(+), 11 deletions(-) delete mode 100755 update diff --git a/install b/install index 22d06de..c396439 100755 --- a/install +++ b/install @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash DIR=$(readlink -f $(dirname $0)) pushd $HOME >/dev/null @@ -7,14 +7,14 @@ ln -sf $DIR/vimrc .vimrc popd $HOME >/dev/null [ ! -d $DIR/autoload ] && mkdir $DIR/autoload -curl -so $DIR/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/HEAD/autoload/pathogen.vim +echo "update pathogen" && curl -# -o $DIR/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/HEAD/autoload/pathogen.vim PROTO=git +# github.com/Townk/vim-autoclose.git GIT_URLS=" github.com/scrooloose/nerdtree.git github.com/msanders/snipmate.vim.git github.com/vim-scripts/taglist.vim.git - github.com/Townk/vim-autoclose.git github.com/tpope/vim-commentary.git github.com/mirell/vim-matchit.git github.com/tpope/vim-repeat.git @@ -23,5 +23,11 @@ GIT_URLS=" [ ! -d $DIR/bundle ] && mkdir $DIR/bundle cd $DIR/bundle for url in $GIT_URLS; do - git clone "$PROTO://$url" + gitdir=${url##*/} + dir=${gitdir%.git} + if [ -d "$dir/.git" ]; then + cd $dir && echo "update $dir" && git pull; cd .. + else + git clone "$PROTO://$url" + fi done diff --git a/update b/update deleted file mode 100755 index 59ae847..0000000 --- a/update +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -DIR=$(readlink -f $(dirname $0)) -curl -so $DIR/autoload/pathogen.vim https://raw.github.com/tpope/vim-pathogen/HEAD/autoload/pathogen.vim -for repo in $DIR/bundle/*; do - echo -en " ${repo##*/}\n " && cd $repo && git pull -done -- cgit v1.1-2-g2b99