diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-08-17 22:11:02 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-08-17 22:11:02 +0200 |
| commit | 7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3 (patch) | |
| tree | 5838cd7680079df68483d092965a8a10b4cad293 /lib | |
| parent | 613045e7e565a9069568e7f94574701c3d440489 (diff) | |
| download | zsh-7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3.tar.gz zsh-7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3.tar.bz2 zsh-7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3.zip | |
Fix upgrade_oh_my_zsh function deprecation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cli.zsh | 4 | ||||
| -rw-r--r-- | lib/functions.zsh | 16 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/cli.zsh b/lib/cli.zsh index 3c09cdab8..d8203f271 100644 --- a/lib/cli.zsh +++ b/lib/cli.zsh @@ -201,10 +201,14 @@ function _omz::pr::test { } function _omz::update { + # Run update script env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" # Update last updated file zmodload zsh/datetime echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update" # Remove update lock if it exists command rm -rf "$ZSH/log/update.lock" + # Restart the zsh session + _omz::log info "restarting the zsh session..." + [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh } diff --git a/lib/functions.zsh b/lib/functions.zsh index e85b867a5..0556aeb29 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -7,8 +7,20 @@ function uninstall_oh_my_zsh() { } function upgrade_oh_my_zsh() { - echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" - omz update + if (( $+functions[_omz::update] )); then + echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color" + fi + + # Run update script + env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh" + # Update last updated file + zmodload zsh/datetime + echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update" + # Remove update lock if it exists + command rm -rf "$ZSH/log/update.lock" + # Restart the zsh session + _omz::log info "restarting the zsh session..." + [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh } function take() { |