linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(updater): don't show changelog when running unattended update (#9495)

Browse source 
Fixes #9495
This commit is contained in:
Marc Cornellà 2020-12-07 19:53:07 +01:00
parent fa1911f89e
commit 5a888ff4ac
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/cli.zsh
View file

@ -376,13 +376,19 @@ function _omz::theme::use {
function _omz::update {
# Run update script
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
if [[ "$1" != --unattended ]]; then
ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
else
ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
fi
local ret=$?
# Update last updated file
zmodload zsh/datetime
echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
# Remove update lock if it exists
command rm -rf "$ZSH/log/update.lock"
# Restart the zsh session
if [[ $ret -eq 0 && "$1" != --unattended ]]; then
# Check whether to run a login shell

2
lib/functions.zsh
View file

@ -14,7 +14,7 @@ function upgrade_oh_my_zsh() {
fi
# Run update script
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
local ret=$?
# Update last updated file
zmodload zsh/datetime

2
tools/check_for_upgrade.sh
View file

@ -24,7 +24,7 @@ function update_last_updated_file() {
}
function update_ohmyzsh() {
ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
update_last_updated_file
}

10
tools/upgrade.sh
View file

@ -70,10 +70,12 @@ if git pull --rebase --stat origin master; then
message="Hooray! Oh My Zsh has been updated!"
# Display changelog with less if available, otherwise just print it to the terminal
if (( $+commands[less] )); then
"$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | command less -R
else
"$ZSH/tools/changelog.sh" HEAD "$last_commit"
if [[ "$1" = --interactive ]]; then
if (( $+commands[less] )); then
"$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | LESS= command less -R
else
"$ZSH/tools/changelog.sh" HEAD "$last_commit"
fi
fi
fi