From c113e88c454cf759078f06c95f4b35db90acb9d7 Mon Sep 17 00:00:00 2001
From: Tim Taylor <tim@tool-man.org>
Date: Wed, 17 Aug 2011 00:17:21 -0400
Subject: Fix auto upgrade failure from non-exported ZSH env var

Fixes #549. Specify ZSH=$ZSH explicitly when invoking
the auto update scripts.
---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/check_for_upgrade.sh')

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
-- 
cgit v1.2.3-70-g09d2


From 4173ba1e95403f3d2cd28b0ad5d5f2c0691f86b7 Mon Sep 17 00:00:00 2001
From: Graham McMillan <mcmgraham@gmail.com>
Date: Tue, 15 Nov 2011 13:46:14 -0500
Subject: Added option to disable the update prompt. Set DISABLE_UPDATE_PROMPT
 to true to enable.

---
 tools/check_for_upgrade.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'tools/check_for_upgrade.sh')

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index aeaa0e415..524aa509d 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -8,6 +8,12 @@ function _update_zsh_update() {
   echo "LAST_EPOCH=$(_current_epoch)" > ~/.zsh-update
 }
 
+function _upgrade_zsh() {
+  /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
+  # update the zsh file
+  _update_zsh_update
+}
+
 if [ -f ~/.zsh-update ]
 then
   . ~/.zsh-update
@@ -19,17 +25,21 @@ then
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
   if [ $epoch_diff -gt 6 ]
   then
-    echo "[Oh My Zsh] Would you like to check for updates?"
-    echo "Type Y to update oh-my-zsh: \c"
-    read line
-    if [ "$line" = Y ] || [ "$line" = y ]
+    if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then
-      /usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh
-      # update the zsh file
-      _update_zsh_update
+      _upgrade_zsh
+    else
+      echo "[Oh My Zsh] Would you like to check for updates?"
+      echo "Type Y to update oh-my-zsh: \c"
+      read line
+      if [ "$line" = Y ] || [ "$line" = y ]
+      then
+        _upgrade_zsh
+      fi
     fi
   fi
 else
   # create the zsh file
   _update_zsh_update
 fi
+
-- 
cgit v1.2.3-70-g09d2


From 91b4758d8f5a910a60de783f15acb66acda68d7f Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 31 May 2012 09:52:53 -0700
Subject: Now with 50% less auto-updates.

---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/check_for_upgrade.sh')

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 524aa509d..bbd705a1e 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -23,7 +23,7 @@ then
   fi
 
   epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))
-  if [ $epoch_diff -gt 6 ]
+  if [ $epoch_diff -gt 13 ]
   then
     if [ "$DISABLE_UPDATE_PROMPT" = "true" ]
     then
-- 
cgit v1.2.3-70-g09d2


From 1c23a52f5744ef419e83733d18a6a698ddd14d1e Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 20 Jul 2012 15:07:51 -0700
Subject: auto-upadate feature will now reset the epoch so that if a user
 doesn't say yes, it won't ask them again for a while. fixes #1240

---
 tools/check_for_upgrade.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools/check_for_upgrade.sh')

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index bbd705a1e..612901cbe 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -32,9 +32,10 @@ then
       echo "[Oh My Zsh] Would you like to check for updates?"
       echo "Type Y to update oh-my-zsh: \c"
       read line
-      if [ "$line" = Y ] || [ "$line" = y ]
-      then
+      if [ "$line" = Y ] || [ "$line" = y ]; then
         _upgrade_zsh
+      else
+        _update_zsh_update
       fi
     fi
   fi
-- 
cgit v1.2.3-70-g09d2