From 77f0110d5f551935df0dba43de8402c22fac064e Mon Sep 17 00:00:00 2001 From: Andrew Vit Date: Wed, 9 Nov 2011 16:58:45 -0800 Subject: [PATCH] Allow (re)installing from local repo If a local directory exists, perhaps a forked copy instead of the robbyrussell master, this allows the installer script to use it and continue the install process instead of exiting early. Changes the installer to continue even if the $ZSH directory is already installed. --- tools/install.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/install.sh b/tools/install.sh index d8606a2c0..1b60378a4 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,18 +5,15 @@ then ZSH=~/.oh-my-zsh fi -if [ -d $ZSH ] +if [ ! -d $ZSH ] then - echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install" - exit + echo "\033[0;34mCloning Oh My Zsh...\033[0m" + hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { + echo "git not installed" + exit + } fi -echo "\033[0;34mCloning Oh My Zsh...\033[0m" -hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { - echo "git not installed" - exit -} - echo "\033[0;34mLooking for an existing zsh config...\033[0m" if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] then