From b66b461811d50519af23ca59ee5da7154655328d Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Fri, 12 Mar 2021 19:38:08 -0800 Subject: [PATCH] Expand quiet checks in update and update-report --- Library/Homebrew/cmd/update-report.rb | 4 ++-- Library/Homebrew/cmd/update.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index c258b81b9b..aeee8ffa79 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -129,7 +129,7 @@ module Homebrew if hub.empty? puts_stdout_or_stderr "No changes to formulae." unless args.quiet? else - hub.dump(updated_formula_report: !args.preinstall?) + hub.dump(updated_formula_report: !args.preinstall?) unless args.quiet? hub.reporters.each(&:migrate_tap_migration) hub.reporters.each { |r| r.migrate_formula_rename(force: args.force?, verbose: args.verbose?) } CacheStoreDatabase.use(:descriptions) do |db| @@ -137,7 +137,7 @@ module Homebrew .update_from_report!(hub) end - unless args.preinstall? + if !args.preinstall? && !args.quiet? outdated_formulae = Formula.installed.count(&:outdated?) outdated_casks = Cask::Caskroom.casks.count(&:outdated?) update_pronoun = if (outdated_formulae + outdated_casks) == 1 diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index 92999d7b80..9b2c4560e9 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -308,6 +308,7 @@ homebrew-update() { -\?|-h|--help|--usage) brew help update; exit $? ;; --verbose) HOMEBREW_VERBOSE=1 ;; --debug) HOMEBREW_DEBUG=1 ;; + --quiet) HOMEBREW_QUIET=1 ;; --merge) HOMEBREW_MERGE=1 ;; --force) HOMEBREW_UPDATE_FORCE=1 ;; --simulate-from-current-branch) HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH=1 ;; @@ -315,6 +316,7 @@ homebrew-update() { --*) ;; -*) [[ "$option" = *v* ]] && HOMEBREW_VERBOSE=1 + [[ "$option" = *q* ]] && HOMEBREW_QUIET=1 [[ "$option" = *d* ]] && HOMEBREW_DEBUG=1 [[ "$option" = *f* ]] && HOMEBREW_UPDATE_FORCE=1 ;; @@ -661,7 +663,8 @@ EOS then brew update-report "$@" return $? - elif [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] + elif [[ -z "$HOMEBREW_UPDATE_PREINSTALL" && + -z "$HOMEBREW_QUIET" ]] then echo "Already up-to-date." fi