Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

This commit is contained in:
Yin Hou 2013-01-09 15:49:39 -05:00
commit fe75a61243
98 changed files with 5623 additions and 338 deletions

View file

@ -13,9 +13,8 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/yinhou/oh-my-zs
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
then
echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m";
cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
rm ~/.zshrc;
echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
fi
echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"