diff options
author | Tuowen Zhao <ztuowen@gmail.com> | 2021-01-18 13:16:40 -0700 |
---|---|---|
committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-01-18 13:16:40 -0700 |
commit | c6e754a3119b7273a57f0cfed38e85303662d26b (patch) | |
tree | c50ae3c6b0271ec88e964d3a57199ea37e63bf0b /tools/upgrade.sh | |
parent | fb45741fc1dbd40dd2be72bc35a28c6ee8f3f7a5 (diff) | |
parent | efcbd9f3480a28ec69c607c46adcbfd8d230ac9f (diff) | |
download | zsh-c6e754a3119b7273a57f0cfed38e85303662d26b.tar.gz zsh-c6e754a3119b7273a57f0cfed38e85303662d26b.tar.bz2 zsh-c6e754a3119b7273a57f0cfed38e85303662d26b.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools/upgrade.sh')
-rwxr-xr-x | tools/upgrade.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 4df7eb184..358242d0f 100755 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -75,14 +75,10 @@ if git pull --rebase --stat origin master; then # Display changelog with less if available, otherwise just print it to the terminal 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 + "$ZSH/tools/changelog.sh" HEAD "$last_commit" fi - printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog again with" "omz changelog" + printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog" fi printf '%s %s__ %s %s %s %s %s__ %s\n' $RAINBOW $RESET |