From de8299d6c4f50bc40286a05cd7e802b6bffe41f0 Mon Sep 17 00:00:00 2001
From: Chao Du <duchao0726@gmail.com>
Date: Mon, 2 Nov 2015 14:29:37 +0800
Subject: [PATCH] Fixed Issue #4550: Move ~/.zsh-update file to $ZSH_CACHE_DIR

---
 oh-my-zsh.sh               | 14 +++++++-------
 tools/check_for_upgrade.sh |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 72527362f..ca505d1ba 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,6 +1,12 @@
+# Set ZSH_CACHE_DIR to the path where cache files should be created
+# or else we will use the default cache/
+if [[ -z "$ZSH_CACHE_DIR" ]]; then
+  ZSH_CACHE_DIR="$ZSH/cache"
+fi
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
+  env ZSH=$ZSH ZSH_CACHE_DIR=$ZSH_CACHE_DIR DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh
@@ -17,12 +23,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-# Set ZSH_CACHE_DIR to the path where cache files should be created
-# or else we will use the default cache/
-if [[ -z "$ZSH_CACHE_DIR" ]]; then
-  ZSH_CACHE_DIR="$ZSH/cache"
-fi
-
 
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index b42b87750..05b31e8d4 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -7,7 +7,7 @@ function _current_epoch() {
 }
 
 function _update_zsh_update() {
-  echo "LAST_EPOCH=$(_current_epoch)" >! ~/.zsh-update
+  echo "LAST_EPOCH=$(_current_epoch)" >! ${ZSH_CACHE_DIR}/.zsh-update
 }
 
 function _upgrade_zsh() {
@@ -30,11 +30,11 @@ fi
 whence git >/dev/null || return 0
 
 if mkdir "$ZSH/log/update.lock" 2>/dev/null; then
-  if [ -f ~/.zsh-update ]; then
-    . ~/.zsh-update
+  if [ -f ${ZSH_CACHE_DIR}/.zsh-update ]; then
+    . ${ZSH_CACHE_DIR}/.zsh-update
 
     if [[ -z "$LAST_EPOCH" ]]; then
-      _update_zsh_update && return 0;
+      _update_zsh_update && return 0
     fi
 
     epoch_diff=$(($(_current_epoch) - $LAST_EPOCH))