Skip to content

Commit

Permalink
Merge pull request #19135 from Homebrew/improve_quiet_output
Browse files Browse the repository at this point in the history
formula_installer: improve quiet output.
  • Loading branch information
MikeMcQuaid authored Jan 23, 2025
2 parents 0a422da + e6b8ed8 commit a3b0f9e
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions Library/Homebrew/formula_installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ def install

# Warn if a more recent version of this formula is available in the tap.
begin
if formula.pkg_version < (v = Formulary.factory(formula.full_name, force_bottle: force_bottle?).pkg_version)
if !quiet? &&
formula.pkg_version < (v = Formulary.factory(formula.full_name, force_bottle: force_bottle?).pkg_version)
opoo "#{formula.full_name} #{v} is available and more recent than version #{formula.pkg_version}."
end
rescue FormulaUnavailableError
Expand Down Expand Up @@ -847,6 +848,7 @@ def caveats
audit_installed if Homebrew::EnvConfig.developer?

return if !installed_on_request? || installed_as_dependency?
return if quiet?

caveats = Caveats.new(formula)

Expand All @@ -873,13 +875,15 @@ def finish
Homebrew::Install.global_post_install

if build_bottle? || skip_post_install?
if build_bottle?
ohai "Not running 'post_install' as we're building a bottle"
elsif skip_post_install?
ohai "Skipping 'post_install' on request"
unless quiet?
if build_bottle?
ohai "Not running 'post_install' as we're building a bottle"
elsif skip_post_install?
ohai "Skipping 'post_install' on request"
end
puts "You can run it manually using:"
puts " brew postinstall #{formula.full_name}"
end
puts "You can run it manually using:"
puts " brew postinstall #{formula.full_name}"
else
formula.install_etc_var
post_install if formula.post_install_defined?
Expand Down Expand Up @@ -1321,6 +1325,7 @@ def fetch
fetch_dependencies

return if only_deps?
return if formula.local_bottle_path.present?

oh1 "Fetching #{Formatter.identifier(formula.full_name)}".strip

Expand All @@ -1347,8 +1352,7 @@ def fetch
if check_attestation &&
Homebrew::Attestation.enabled? &&
formula.tap&.core_tap? &&
formula.name != "gh" &&
formula.local_bottle_path.blank?
formula.name != "gh"
ohai "Verifying attestation for #{formula.name}"
begin
Homebrew::Attestation.check_core_attestation T.cast(downloadable_object, Bottle)
Expand Down

0 comments on commit a3b0f9e

Please sign in to comment.