Skip to content

Commit

Permalink
Fixed Issue ohmyzsh#4550: Move ~/.zsh-update file to $ZSH_CACHE_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
duchao0726 authored and mcornella committed Jun 15, 2018
1 parent e96ca34 commit de8299d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions oh-my-zsh.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/check_for_upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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))
Expand Down

0 comments on commit de8299d

Please sign in to comment.