summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md12
-rw-r--r--lib/cli.zsh5
-rw-r--r--tools/check_for_upgrade.sh3
-rwxr-xr-xtools/upgrade.sh53
4 files changed, 56 insertions, 17 deletions
diff --git a/README.md b/README.md
index 4042c8c26..4f0aeb7b4 100644
--- a/README.md
+++ b/README.md
@@ -317,6 +317,18 @@ zstyle ':omz:update' frequency 7
zstyle ':omz:update' frequency 0
```
+### Updates verbosity
+
+You can also limit the update verbosity with the following settings:
+
+```sh
+zstyle ':omz:update' verbose default # default update prompt
+
+zstyle ':omz:update' verbose minimal # only few lines
+
+zstyle ':omz:update' verbose silent # only errors
+```
+
### Manual Updates
If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
diff --git a/lib/cli.zsh b/lib/cli.zsh
index fed00d21d..ba3e39eb5 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -776,10 +776,11 @@ function _omz::update {
local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
# Run update script
+ zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
if [[ "$1" != --unattended ]]; then
- ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+ ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode || return $?
else
- ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
+ ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -v $verbose_mode || return $?
fi
# Update last updated file
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 734714c94..81c371b3f 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -95,7 +95,8 @@ function update_last_updated_file() {
}
function update_ohmyzsh() {
- if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then
+ zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
+ if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode; then
update_last_updated_file
fi
}
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 596a59302..684ad894a 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -12,6 +12,23 @@ esac
cd "$ZSH"
+verbose_mode="default"
+interactive=false
+
+while getopts "v:i" opt; do
+ case $opt in
+ v)
+ if [[ $OPTARG == default || $OPTARG == minimal || $OPTARG == silent ]]; then
+ verbose_mode=$OPTARG
+ else
+ echo "[oh-my-zsh] update verbosity '$OPTARG' is not valid"
+ echo "[oh-my-zsh] valid options are 'default', 'minimal' and 'silent'"
+ fi
+ ;;
+ i) interactive=true ;;
+ esac
+done
+
# Use colors, but only if connected to a terminal
# and that terminal supports them.
@@ -203,7 +220,9 @@ git checkout -q "$branch" -- || exit 1
last_commit=$(git rev-parse "$branch")
# Update Oh My Zsh
-printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
+if [[ $verbose_mode != silent ]]; then
+ printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
+fi
if LANG= git pull --quiet --rebase $remote $branch; then
# Check if it was really updated or not
if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
@@ -215,24 +234,30 @@ if LANG= git pull --quiet --rebase $remote $branch; then
git config oh-my-zsh.lastVersion "$last_commit"
# Print changelog to the terminal
- if [[ "$1" = --interactive ]]; then
+ if [[ interactive == true && $verbose_mode == default ]] ; then
"$ZSH/tools/changelog.sh" HEAD "$last_commit"
fi
- printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
+ if [[ $verbose_mode != silent ]]; then
+ printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
+ fi
fi
- printf '%s %s__ %s %s %s %s %s__ %s\n' $RAINBOW $RESET
- printf '%s ____ %s/ /_ %s ____ ___ %s__ __ %s ____ %s_____%s/ /_ %s\n' $RAINBOW $RESET
- printf '%s / __ \\%s/ __ \\ %s / __ `__ \\%s/ / / / %s /_ / %s/ ___/%s __ \\ %s\n' $RAINBOW $RESET
- printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s / /_%s(__ )%s / / / %s\n' $RAINBOW $RESET
- printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s /___/%s____/%s_/ /_/ %s\n' $RAINBOW $RESET
- printf '%s %s %s %s /____/ %s %s %s %s\n' $RAINBOW $RESET
- printf '\n'
- printf "${BLUE}%s${RESET}\n\n" "$message"
- printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
- printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
- printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+ if [[ $verbose_mode == default ]]; then
+ printf '%s %s__ %s %s %s %s %s__ %s\n' $RAINBOW $RESET
+ printf '%s ____ %s/ /_ %s ____ ___ %s__ __ %s ____ %s_____%s/ /_ %s\n' $RAINBOW $RESET
+ printf '%s / __ \\%s/ __ \\ %s / __ `__ \\%s/ / / / %s /_ / %s/ ___/%s __ \\ %s\n' $RAINBOW $RESET
+ printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s / /_%s(__ )%s / / / %s\n' $RAINBOW $RESET
+ printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s /___/%s____/%s_/ /_/ %s\n' $RAINBOW $RESET
+ printf '%s %s %s %s /____/ %s %s %s %s\n' $RAINBOW $RESET
+ printf '\n'
+ printf "${BLUE}%s${RESET}\n\n" "$message"
+ printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+ printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+ printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+ elif [[ $verbose_mode == minimal ]]; then
+ printf "${BLUE}%s${RESET}\n" "$message"
+ fi
else
ret=$?
printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-02 04:02:41 +0000