From 9cfe0fdf449dd47a6dea2cb71721924987552617 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 30 Mar 2015 13:47:10 +0200 Subject: [PATCH] Don't force oh-my-zsh if it exists. --- install.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 14c9fe8..827e426 100755 --- a/install.sh +++ b/install.sh @@ -41,14 +41,18 @@ echo "Installing vim." confirmAndLink $DIR/vim/vimrc $HOME/.vimrc confirmAndLink $DIR/vim $HOME/.vim -echo "Installing zsh" - -if [ ! -e $HOME/.oh-my-zsh ] +which zsh +if which zsh then - curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh - rm $HOME/.zshrc -else - confirmAndLink $DIR/zshrc $HOME/.zshrc + echo "Installing zsh" + + if [ ! -e $HOME/.oh-my-zsh ] + then + curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh + rm $HOME/.zshrc + else + confirmAndLink $DIR/zshrc $HOME/.zshrc + fi + + echo "Installation finished." fi - -echo "Installation finished."