From 7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 17 Aug 2020 22:11:02 +0200
Subject: Fix upgrade_oh_my_zsh function deprecation

---
 lib/functions.zsh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib/functions.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() {
-- 
cgit v1.2.3-70-g09d2


From 89400f156a6e1d64acaeab9ec265f54cdab91817 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 18 Aug 2020 19:51:19 +0200
Subject: Remove zsh session restart on omz update and upgrade_oh_my_zsh

---
 lib/cli.zsh       | 3 ---
 lib/functions.zsh | 3 ---
 2 files changed, 6 deletions(-)

(limited to 'lib/functions.zsh')

diff --git a/lib/cli.zsh b/lib/cli.zsh
index d8203f271..c1ae2bdf2 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -208,7 +208,4 @@ function _omz::update {
     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 0556aeb29..4bc533b7a 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -18,9 +18,6 @@ function upgrade_oh_my_zsh() {
   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() {
-- 
cgit v1.2.3-70-g09d2