From d81a06e9f96cbcd0beb47713d03310fb30a13d60 Mon Sep 17 00:00:00 2001 From: staticsafe Date: Sat, 16 Jun 2012 15:12:23 -0400 Subject: [PATCH 1/3] Use hash instead of which in install script See - http://stackoverflow.com/a/677212/1403956 --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index 8ca427d2c..6fe59b3a3 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,7 +5,7 @@ then fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -which git > /dev/null +hash git &>/dev/null if [[ $? -eq 0 ]]; then /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh else From 02306deac00fb353a1e1ac969ad6e643b1cc3b37 Mon Sep 17 00:00:00 2001 From: staticsafe Date: Sat, 16 Jun 2012 15:35:29 -0400 Subject: [PATCH 2/3] using command -v instead of which for changing the shell. --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index 6fe59b3a3..29a883ff9 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -28,7 +28,7 @@ echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc f echo "export PATH=$PATH" >> ~/.zshrc echo "\033[0;34mTime to change your default shell to zsh!\033[0m" -chsh -s `which zsh` +chsh -s `command -v zsh` echo "\033[0;32m"' __ __ '"\033[0m" echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" From 768b6722bfcf241be3445b9ccb3cfb01e106f44a Mon Sep 17 00:00:00 2001 From: staticsafe Date: Sat, 16 Jun 2012 15:40:19 -0400 Subject: [PATCH 3/3] use command -v instead because this script runs in sh. --- tools/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install.sh b/tools/install.sh index 29a883ff9..8f78c69ab 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,7 +5,7 @@ then fi echo "\033[0;34mCloning Oh My Zsh...\033[0m" -hash git &>/dev/null +command -v git &>/dev/null if [[ $? -eq 0 ]]; then /usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh else