linux/ohmyzsh
Watch
1
0
Fork
You've already forked ohmyzsh
 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-08-07 06:08:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(updater): retry invalid update prompt input

Browse source
This commit is contained in:
TaeyoungPark 2026-06-19 21:04:45 +09:00
commit 121a2b282f
1 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tools/check_for_upgrade.sh
View file

@ -108,6 +108,28 @@ ERROR='${error//\'/’}'
EOD EOD
} }
function read_update_confirmation() {
local option prompt
prompt="[oh-my-zsh] Would you like to update? [Y/n] "
while true; do
printf "%s" "$prompt"
if ! read -r -k 1 option; then
echo
return 1
fi
[[ "$option" = $'\n' ]] || echo
case "$option" in
[yY$'\n']) return 0 ;;
[nN]) return 1 ;;
*) prompt="[oh-my-zsh] Please enter 'y' or 'n': " ;;
esac
done
}
function update_ohmyzsh() { function update_ohmyzsh() {
local verbose_mode local verbose_mode
zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
@ -162,7 +184,7 @@ function handle_update() {
() { () {
emulate -L zsh emulate -L zsh
local epoch_target mtime option LAST_EPOCH local epoch_target mtime LAST_EPOCH
# Remove lock directory if older than a day # Remove lock directory if older than a day
zmodload zsh/datetime zmodload zsh/datetime
@ -187,7 +209,7 @@ function handle_update() {
trap " trap "
ret=\$? ret=\$?
unset update_mode unset update_mode
unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh handle_update 2>/dev/null unset -f current_epoch is_update_available update_last_updated_file read_update_confirmation update_ohmyzsh handle_update 2>/dev/null
command rm -rf '$ZSH/log/update.lock' command rm -rf '$ZSH/log/update.lock'
return \$ret return \$ret
" EXIT INT QUIT " EXIT INT QUIT
@ -231,19 +253,16 @@ function handle_update() {
fi fi
# Ask for confirmation and only update on 'y', 'Y' or Enter # Ask for confirmation and only update on 'y', 'Y' or Enter
# Otherwise just show a reminder for how to update if read_update_confirmation; then
printf "[oh-my-zsh] Would you like to update? [Y/n] " update_ohmyzsh
read -r -k 1 option else
[[ "$option" = $'\n' ]] || echo update_last_updated_file
case "$option" in echo "[oh-my-zsh] You can update manually by running \`omz update\`"
[yY$'\n']) update_ohmyzsh ;; fi
[nN]) update_last_updated_file ;&
*) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
esac
} }
unset update_mode unset update_mode
unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh handle_update unset -f current_epoch is_update_available update_last_updated_file read_update_confirmation update_ohmyzsh handle_update
} }
case "$update_mode" in case "$update_mode" in