From 7c9474508cade14102a2fe1c63ad845fda521bec Mon Sep 17 00:00:00 2001
From: vguerci <vguerci@gmail.com>
Date: Sat, 4 Jun 2011 11:02:25 +0200
Subject: [upgrade] before init (no reload needed unless oh-my-zsh.sh has been
 modified)

---
 oh-my-zsh.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'oh-my-zsh.sh')

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index dbff1ced9..2157c38a0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,11 @@
+# Check for updates on initial load...
+if [ "$DISABLE_AUTO_UPDATE" = "true" ]
+then
+  return
+else
+  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
+fi
+
 # Initializes Oh My Zsh
 
 # add a function path
@@ -28,7 +36,6 @@ done
 for config_file ($ZSH/custom/*.zsh) source $config_file
 
 # Load the theme
-# Check for updates on initial load...
 if [ "$ZSH_THEME" = "random" ]
 then
   themes=($ZSH/themes/*zsh-theme)
@@ -41,11 +48,3 @@ else
   source "$ZSH/themes/$ZSH_THEME.zsh-theme"
 fi
 
-
-# Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
-then
-  return
-else
-  /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
-fi
-- 
cgit v1.2.3-70-g09d2


From 9b4a89f327a045ed5e756ae4e75d1aac68803164 Mon Sep 17 00:00:00 2001
From: Michael Komitee <mkomitee@me.com>
Date: Sat, 4 Jun 2011 14:03:10 -0400
Subject: Fix bug from Pull request #395     #395 broke oh-my-zsh for users who
 disable check-for-updates

---
 oh-my-zsh.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'oh-my-zsh.sh')

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 2157c38a0..d72d90cf9 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,8 +1,6 @@
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
+if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  return
-else
   /usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
-- 
cgit v1.2.3-70-g09d2