diff options
| author | Robby Russell <robby@planetargon.com> | 2014-08-31 11:42:40 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-08-31 11:42:40 -0700 |
| commit | c1cd9cb1268360f8f95cdc904fd9106063754620 (patch) | |
| tree | d5b5b342c6bfc42c87e30e6d88a25f454cb0f081 /tools | |
| parent | fc365f5bdcb1fe63b4fe3c2e135a9c101e4c5d3a (diff) | |
| parent | 91ba6d98875c70d0736fd3eecd0ee4aae52cdc74 (diff) | |
| download | zsh-c1cd9cb1268360f8f95cdc904fd9106063754620.tar.gz zsh-c1cd9cb1268360f8f95cdc904fd9106063754620.tar.bz2 zsh-c1cd9cb1268360f8f95cdc904fd9106063754620.zip | |
Merge pull request #3049 from strycore/master
Prevent chsh from running when $SHELL is already zsh
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/install.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/install.sh b/tools/install.sh index 3ff897a01..a53ac48ab 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -32,8 +32,10 @@ sed -i -e "/export PATH=/ c\\ export PATH=\"$PATH\" " ~/.zshrc -echo "\033[0;34mTime to change your default shell to zsh!\033[0m" -chsh -s `which zsh` +if [ "$SHELL" != "$(which zsh)" ]; then + echo "\033[0;34mTime to change your default shell to zsh!\033[0m" + chsh -s `which zsh` +fi echo "\033[0;32m"' __ __ '"\033[0m" echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m" |