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

Conflicts:
	tools/install.sh
This commit is contained in:
Nicolas McCurdy 2012-06-22 11:15:04 -04:00
commit 034af226f6
30 changed files with 218 additions and 44 deletions

View file

@ -5,8 +5,14 @@ then
fi
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
/usr/bin/env git clone https://github.com/thenickperson/oh-my-zsh.git ~/.oh-my-zsh
/usr/bin/env git remote add upstream https://github.com/robbyrussell/oh-my-zsh.git
which git > /dev/null
if [[ $? -eq 0 ]]; then
/usr/bin/env git clone https://github.com/thenickperson/oh-my-zsh.git ~/.oh-my-zsh
/usr/bin/env git remote add upstream https://github.com/robbyrussell/oh-my-zsh.git
else
echo "git not installed"
exit
fi
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]