Merge pull request #554 from toolbear/549-fix-auto-upgrade

Fix auto upgrade failure from non-exported ZSH env var
15 years ago · 0fe2462af8
parent 167f84dacd c113e88c45
commit 0fe2462af8
2 changed files with 2 additions and 2 deletions
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@ -1,7 +1,7 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH zsh $ZSH/tools/check_for_upgrade.sh
 fi

 # Initializes Oh My Zsh
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@ -24,7 +24,7 @@ then
    read line
    if [ "$line" = Y ] || [ "$line" = y ]
    then
-      /bin/sh $ZSH/tools/upgrade.sh
+      /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
      # update the zsh file
      _update_zsh_update
    fi