Merge remote-tracking branch 'upstream/master'

This commit is contained in:
David Robertson 2013-01-27 14:51:22 +00:00
commit c19bb1d982
84 changed files with 2026 additions and 379 deletions

View file

@ -15,9 +15,8 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/DavidJRobertson
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"