diff options
| author | Robby Russell <robby@planetargon.com> | 2011-10-10 05:40:38 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2011-10-10 05:40:38 -0700 |
| commit | 0fe2462af8ba0b1fc080e9eea6bac583db4b3b48 (patch) | |
| tree | 82125c314428a450b380223c5742dd8cb3c3d0c5 | |
| parent | 167f84dacd57bcb287d68df75c24163d24859253 (diff) | |
| parent | c113e88c454cf759078f06c95f4b35db90acb9d7 (diff) | |
| download | zsh-0fe2462af8ba0b1fc080e9eea6bac583db4b3b48.tar.gz zsh-0fe2462af8ba0b1fc080e9eea6bac583db4b3b48.tar.bz2 zsh-0fe2462af8ba0b1fc080e9eea6bac583db4b3b48.zip | |
Merge pull request #554 from toolbear/549-fix-auto-upgrade
Fix auto upgrade failure from non-exported ZSH env var
| -rw-r--r-- | oh-my-zsh.sh | 2 | ||||
| -rw-r--r-- | tools/check_for_upgrade.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index 3865abe17..891e8d467 100644 --- 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 diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index e1e4eb99f..aeaa0e415 100644 --- 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 |