5bd590ceb30ca58d96ec8d5dcfc1fec71bc6ca1f

Author
Andrew Vit <andrew@avit.ca>
Committer
Andrew Vit <andrew@avit.ca>
Date

Message

Reference default install path from ZSH variable

Diff

 1diff --git a/tools/install.sh b/tools/install.sh
 2index b24bb4ad33fc4565b4316cb5d00b860090c4830e..01984ea2b31bdcce67bd161320143a4a469822b8 100755
 3--- a/tools/install.sh
 4+++ b/tools/install.sh
 5@@ -1,16 +1,16 @@
 6-ZSH=`/usr/bin/env|grep 'ZSH='|cut -d '=' -f 2`
 7-if [ -d "$ZSH" ]
 8+if [ ! -n $ZSH ]
 9 then
10-  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
11-  exit
12-elif [ -d ~/.oh-my-zsh ]
13+  ZSH=~/.oh-my-zsh
14+fi
15+
16+if [ -d $ZSH ]
17 then
18-  echo "\033[0;33mYou already have One Oh My Zsh Directory.\033[0m You'll need to remove  ~/.oh-my-zsh if you want to clone"
19+  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove $ZSH if you want to install"
20   exit
21 fi
22 
23 echo "\033[0;34mCloning Oh My Zsh...\033[0m"
24-hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh || {
25+hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
26   echo "git not installed"
27   exit
28 }
29@@ -23,7 +23,7 @@ then
30 fi
31 
32 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
33-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
34+cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
35 
36 echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
37 sed -i -e "/export PATH=/ c\\