Cornelicorn/oh-my-zsh
1
0 Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-10-03 08:23:47 +02:00
Code Issues Releases Wiki Activity

fix(updater): address cooldown review feedback

Browse Source 
Pass cooldown into upgrade.sh as -c, extract the update helpers, and only
prompt when a cooldown-eligible commit would actually move HEAD.
This commit is contained in:
Robby Russell committed 2026-09-08 16:11:32 -07:00
1 parent 84429a7229
commit e872c661ad
4 files changed
+78 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/check_for_upgrade.sh
+25 -3
View File
@@ -47,6 +47,26 @@ function is_update_available() {
remote=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
remote_url=$(builtin cd -q "$ZSH"; git config remote.$remote.url)
local cooldown_days
zstyle -s ':omz:update' cooldown cooldown_days || cooldown_days=0
[[ $cooldown_days == <-> ]] || cooldown_days=0
if (( cooldown_days > 0 )); then
local local_head cutoff_epoch cooldown_ref
local_head=$(builtin cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
(builtin cd -q "$ZSH"; LANG= git fetch --quiet $remote $branch) || return 1
zmodload zsh/datetime
cutoff_epoch=$(( EPOCHSECONDS - cooldown_days * 86400 ))
cooldown_ref=$(builtin cd -q "$ZSH"; git log --format="%H %ct" FETCH_HEAD \
| awk -v c="$cutoff_epoch" '$2 <= c { print $1; exit }')
[[ -n "$cooldown_ref" ]] || return 1
[[ "$cooldown_ref" != "$local_head" ]] || return 1
if (builtin cd -q "$ZSH"; git merge-base --is-ancestor "$cooldown_ref" "$local_head" 2>/dev/null); then
return 1
fi
return 0
fi
local repo
case "$remote_url" in
https://github.com/*) repo=${${remote_url#https://github.com/}%.git} ;;
@@ -109,8 +129,10 @@ EOD
}
function update_ohmyzsh() {
local verbose_mode
local verbose_mode cooldown_days
zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
zstyle -s ':omz:update' cooldown cooldown_days || cooldown_days=0
[[ $cooldown_days == <-> ]] || cooldown_days=0
# Force verbose mode to silent if p10k instant prompt is enabled
if [[ ${POWERLEVEL9K_INSTANT_PROMPT:-off} != "off" ]]; then
@@ -118,13 +140,13 @@ function update_ohmyzsh() {
fi
if [[ "$update_mode" != background-alpha ]] \
&& LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode; then
&& LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode -c $cooldown_days; then
update_last_updated_file
return $?
fi
local exit_status error
if error=$(LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v silent 2>&1); then
if error=$(LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v silent -c $cooldown_days 2>&1); then
update_last_updated_file 0 "Update successful"
else
exit_status=$?