From ae1042f5151257035b1973bee281240dec96cfac Mon Sep 17 00:00:00 2001 From: joseongbin Date: Tue, 10 Apr 2018 17:21:04 +0900 Subject: [PATCH 1/2] move ~/.zsh-update file to $ZSH_CACHE_DIR --- tools/check_for_upgrade.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index a57f6da0f..2edf3a8a1 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -7,10 +7,13 @@ function _current_epoch() { } function _update_zsh_update() { - echo "LAST_EPOCH=$(_current_epoch)" >! ~/.zsh-update + echo "LAST_EPOCH=$(_current_epoch)" >! ${ZHS_CACHE_DIR}/.zsh-update } function _upgrade_zsh() { + if [ -f ~/.zsh-update ] && [ ! -f ${ZSH_CACHE_DIR}/.zsh-update ]; then + mv ~/.zsh-update ${ZSH_CACHE_DIR}/.zsh-update + fi env ZSH=$ZSH sh $ZSH/tools/upgrade.sh # update the zsh file _update_zsh_update From df43ea2693670d01df93e5b58e3b90aa783c22dd Mon Sep 17 00:00:00 2001 From: joseongbin Date: Tue, 10 Apr 2018 17:36:12 +0900 Subject: [PATCH 2/2] check some errors --- tools/check_for_upgrade.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index 2edf3a8a1..9420bb25f 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -7,13 +7,15 @@ function _current_epoch() { } function _update_zsh_update() { - echo "LAST_EPOCH=$(_current_epoch)" >! ${ZHS_CACHE_DIR}/.zsh-update -} - -function _upgrade_zsh() { + echo "LAST_EPOCH=$(_current_epoch)" >! ${ZSH_CACHE_DIR}/.zsh-update + #if user has ~/.zhs-update move it to ${ZSH_CACHE_DIR}/.zsh-update if [ -f ~/.zsh-update ] && [ ! -f ${ZSH_CACHE_DIR}/.zsh-update ]; then mv ~/.zsh-update ${ZSH_CACHE_DIR}/.zsh-update fi + +} + +function _upgrade_zsh() { env ZSH=$ZSH sh $ZSH/tools/upgrade.sh # update the zsh file _update_zsh_update