shell-user/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-05-11 05:55:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge changes from #4241 into installer-portable-colors

Browse Source 
Conflicts:
	tools/install.sh
	tools/upgrade.sh
This commit is contained in:
Andrew Janke
2015-08-31 13:29:54 -04:00
parent fe92ea98e0 ba5fd57c1f
commit 82c76f6b5c
56 changed files with 4239 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/install.sh
View File

@@ -18,6 +18,12 @@ else
BOLD=""
NORMAL=""
fi
CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
echo "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!"
exit
fi
unset CHECK_ZSH_INSTALLED
if [ ! -n "$ZSH" ]; then
ZSH=~/.oh-my-zsh
@@ -43,14 +49,16 @@ fi
printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
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
printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
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