summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Taylor <tim@tool-man.org>2011-08-17 00:17:21 -0400
committerTim Taylor <tim@tool-man.org>2011-08-17 00:36:27 -0400
commitc113e88c454cf759078f06c95f4b35db90acb9d7 (patch)
treecc77e101306e0bde1fef88172bddc1e2400317ca
parent9f46eafae0bed7df50a0004fca5d25539425ff85 (diff)
downloadzsh-c113e88c454cf759078f06c95f4b35db90acb9d7.tar.gz
zsh-c113e88c454cf759078f06c95f4b35db90acb9d7.tar.bz2
zsh-c113e88c454cf759078f06c95f4b35db90acb9d7.zip
Fix auto upgrade failure from non-exported ZSH env var
Fixes #549. Specify ZSH=$ZSH explicitly when invoking the auto update scripts.
-rw-r--r--oh-my-zsh.sh2
-rw-r--r--tools/check_for_upgrade.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c4522491b..f77762815 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