merge upstream

This commit is contained in:
Toon Claes 2012-08-02 11:27:10 +02:00
commit d3db100dbd
53 changed files with 292 additions and 704 deletions

View file

@ -8,12 +8,6 @@ function _update_zsh_update() {
echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
}
function _upgrade_zsh() {
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
# update the zsh file
_update_zsh_update
}
if [ -f ~/.zsh-update ]
then
. ~/.zsh-update
@ -23,24 +17,19 @@ then
fi
epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
if [ $epoch_diff -gt 13 ]
if [ $epoch_diff -gt 6 ]
then
if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
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
_upgrade_zsh
else
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
_upgrade_zsh
else
_update_zsh_update
fi
/bin/sh $ZSH/tools/upgrade.sh
# update the zsh file
_update_zsh_update
fi
fi
else
# create the zsh file
_update_zsh_update
fi