diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2016-10-09 11:18:56 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2016-10-09 11:18:56 -0600 |
| commit | a2baf45bce6bb8b501512233441af8f65f90a775 (patch) | |
| tree | 3c0b773ed3b77c37ee1d609277a0e8f44d8899f9 /tools | |
| parent | 4af1cb74ad3c3275d3352febf9e14e19f368d65a (diff) | |
| parent | cd37d19ddaf9cc5acbf443f93f88ca355f74090d (diff) | |
| download | zsh-a2baf45bce6bb8b501512233441af8f65f90a775.tar.gz zsh-a2baf45bce6bb8b501512233441af8f65f90a775.tar.bz2 zsh-a2baf45bce6bb8b501512233441af8f65f90a775.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check_for_upgrade.sh | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index bd9aba8be..a57f6da0f 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -29,31 +29,32 @@ fi # Cancel upgrade if git is unavailable on the system whence git >/dev/null || return 0 -if [ -f ~/.zsh-update ] -then - . ~/.zsh-update +if mkdir "$ZSH/log/update.lock" 2>/dev/null; then + if [ -f ~/.zsh-update ]; then + . ~/.zsh-update - if [[ -z "$LAST_EPOCH" ]]; then - _update_zsh_update && return 0; - fi + if [[ -z "$LAST_EPOCH" ]]; then + _update_zsh_update && return 0; + fi - epoch_diff=$(($(_current_epoch) - $LAST_EPOCH)) - if [ $epoch_diff -gt $epoch_target ] - then - if [ "$DISABLE_UPDATE_PROMPT" = "true" ] - then - _upgrade_zsh - else - echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c" - read line - if [[ "$line" == Y* ]] || [[ "$line" == y* ]] || [ -z "$line" ]; then + epoch_diff=$(($(_current_epoch) - $LAST_EPOCH)) + if [ $epoch_diff -gt $epoch_target ]; then + if [ "$DISABLE_UPDATE_PROMPT" = "true" ]; then _upgrade_zsh else - _update_zsh_update + echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c" + read line + if [[ "$line" == Y* ]] || [[ "$line" == y* ]] || [ -z "$line" ]; then + _upgrade_zsh + else + _update_zsh_update + fi fi fi + else + # create the zsh file + _update_zsh_update fi -else - # create the zsh file - _update_zsh_update + + rmdir $ZSH/log/update.lock fi |