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

Conflicts:
	tools/install.sh
This commit is contained in:
Nicolas McCurdy 2012-08-03 00:05:56 -04:00
commit 934e127a0f
12 changed files with 143 additions and 13 deletions

View file

@ -32,9 +32,10 @@ then
echo "[Oh My Zsh] Would you like to check for updates?"
echo "Type Y to update oh-my-zsh: \c"
read line
if [ "$line" = Y ] || [ "$line" = y ]
then
if [ "$line" = Y ] || [ "$line" = y ]; then
_upgrade_zsh
else
_update_zsh_update
fi
fi
fi