From 7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 17 Aug 2020 22:11:02 +0200
Subject: [PATCH] Fix upgrade_oh_my_zsh function deprecation

---
 lib/cli.zsh       |  4 ++++
 lib/functions.zsh | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 3c09cdab82c4..d8203f271dd3 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 e85b867a5682..0556aeb2976c 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() {