`7a6e2c05afd03cf5a1f901b31bc9a4f5e420f832`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2014-02-04 06:23 UTC

Message

Merge pull request #2342 from blackjid/master

Prevents oh-my-zsh loading the .zshenv twice

Diff

 1diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 2index 2ae07668cba44a30e881db71d2d6f1af8f0964cb..3c0f4f8f5f990e09d26d000176bb344d06a7c564 100644
 3--- a/oh-my-zsh.sh
 4+++ b/oh-my-zsh.sh
 5@@ -1,6 +1,6 @@
 6 # Check for updates on initial load...
 7 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
 8-  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 9+  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
10 fi
11 
12 # Initializes Oh My Zsh