diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-03 13:08:41 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-03-03 13:08:41 -0700 |
| commit | 0f2bface6494ae546ea83cbf45b65a18dbc0c4fb (patch) | |
| tree | 5a33e6db95c55b4ad75a064b9c3e40d8f09f6b7b /tools | |
| parent | c6e754a3119b7273a57f0cfed38e85303662d26b (diff) | |
| parent | 6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed (diff) | |
| download | zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.tar.gz zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.tar.bz2 zsh-0f2bface6494ae546ea83cbf45b65a18dbc0c4fb.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check_for_upgrade.sh | 5 | ||||
| -rwxr-xr-x | tools/upgrade.sh | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index d0ceba92d..29a48b880 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -24,8 +24,9 @@ function update_last_updated_file() { } function update_ohmyzsh() { - ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive - update_last_updated_file + if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then + update_last_updated_file + fi } () { diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 358242d0f..417e06fe8 100755 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,7 +1,7 @@ #!/usr/bin/env zsh if [ -z "$ZSH_VERSION" ]; then - exec zsh "$0" + exec zsh "$0" "$@" fi cd "$ZSH" @@ -66,7 +66,6 @@ if git pull --rebase --stat origin master; then # Check if it was really updated or not if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then message="Oh My Zsh is already at the latest version." - ret=80 # non-zero exit code to indicate no changes pulled else message="Hooray! Oh My Zsh has been updated!" |