summaryrefslogtreecommitdiff
path: root/oh-my-zsh.sh
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2014-02-03 22:23:11 -0800
committerRobby Russell <robby@planetargon.com>2014-02-03 22:23:11 -0800
commit7a6e2c05afd03cf5a1f901b31bc9a4f5e420f832 (patch)
tree34877ba45661b03de01e29bdb9e54a763634e051 /oh-my-zsh.sh
parent41d9717252375936af072810c5c168f30fcdc840 (diff)
parentdbdd23d0fa1309444d01d7540a0f3065d514e741 (diff)
downloadzsh-7a6e2c05afd03cf5a1f901b31bc9a4f5e420f832.tar.gz
zsh-7a6e2c05afd03cf5a1f901b31bc9a4f5e420f832.tar.bz2
zsh-7a6e2c05afd03cf5a1f901b31bc9a4f5e420f832.zip
Merge pull request #2342 from blackjid/master
Prevents oh-my-zsh loading the .zshenv twice
Diffstat (limited to 'oh-my-zsh.sh')
-rw-r--r--oh-my-zsh.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 2ae07668c..3c0f4f8f5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,6 @@
# Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
- /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
+ /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
fi
# Initializes Oh My Zsh