summaryrefslogtreecommitdiff
path: root/tools/install.sh
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-03 13:05:24 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-03 13:05:24 -0400
commit93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch)
tree7cc87fcd416bf71cee77f30bf2e60cf607671f43 /tools/install.sh
parent689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff)
parent0532860c618aabc02d5dab34391b967e8e4c6272 (diff)
downloadzsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz
zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2
zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts: plugins/osx/osx.plugin.zsh
Diffstat (limited to 'tools/install.sh')
-rwxr-xr-xtools/install.sh17
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/install.sh b/tools/install.sh
index c83a6f23d..1586cdee5 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,5 +1,12 @@
set -e
+CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
+if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
+ echo "\033[0;33m Zsh is not installed!\033[0m Please install zsh first!"
+ exit
+fi
+unset CHECK_ZSH_INSTALLED
+
if [ ! -n "$ZSH" ]; then
ZSH=~/.oh-my-zsh
fi
@@ -23,14 +30,16 @@ fi
echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
-sed -i -e "/^export ZSH=/ c\\
+sed "/^export ZSH=/ c\\
export ZSH=$ZSH
-" ~/.zshrc
+" ~/.zshrc > ~/.zshrc-omztemp
+mv -f ~/.zshrc-omztemp ~/.zshrc
echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-sed -i -e "/export PATH=/ c\\
+sed "/export PATH=/ c\\
export PATH=\"$PATH\"
-" ~/.zshrc
+" ~/.zshrc > ~/.zshrc-omztemp
+mv -f ~/.zshrc-omztemp ~/.zshrc
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then