From 273717026dc72c54c6590adcc3068c2906cb687d 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 |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 6cc5ac630..07dff3829 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
@@ -19,12 +25,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 1c897cb36..535ac2f5a 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() {
@@ -29,9 +29,9 @@ fi
 # Cancel upgrade if git is unavailable on the system
 whence git >/dev/null || return 0
 
-if [ -f ~/.zsh-update ]
+if [ -f ${ZSH_CACHE_DIR}/.zsh-update ]
 then
-  . ~/.zsh-update
+  . ${ZSH_CACHE_DIR}/.zsh-update
 
   if [[ -z "$LAST_EPOCH" ]]; then
     _update_zsh_update && return 0;