From e1bfbad810c86741c083ec897b4faa623105223a Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 3 Nov 2014 21:36:01 -0600 Subject: [PATCH] Make quieter an installer mode --- Library/Homebrew/cmd/install.rb | 2 +- Library/Homebrew/cmd/upgrade.rb | 2 +- Library/Homebrew/formula_installer.rb | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index dc82e2a7b0..eb93d380b9 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -127,7 +127,7 @@ module Homebrew fi.interactive = ARGV.interactive? fi.git = ARGV.git? fi.verbose = ARGV.verbose? - fi.verbose &&= :quieter if ARGV.quieter? + fi.quieter = ARGV.quieter? fi.debug = ARGV.debug? fi.prelude fi.install diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index c5b875d318..352a4d3403 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -56,7 +56,7 @@ module Homebrew fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_from_source = ARGV.build_from_source? fi.verbose = ARGV.verbose? - fi.verbose &&= :quieter if ARGV.quieter? + fi.quieter = ARGV.quieter? fi.debug = ARGV.debug? fi.prelude diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index b5859df4f1..80d2f5aae4 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -31,7 +31,7 @@ class FormulaInstaller mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :build_from_source, :build_bottle, :force_bottle mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git - mode_attr_accessor :verbose, :debug + mode_attr_accessor :verbose, :debug, :quieter def initialize(formula) @formula = formula @@ -44,6 +44,7 @@ class FormulaInstaller @interactive = false @git = false @verbose = false + @quieter = false @debug = false @options = Options.new @@ -352,7 +353,7 @@ class FormulaInstaller fi.options |= dep.options fi.options |= inherited_options fi.build_from_source = build_from_source? - fi.verbose = verbose? unless verbose == :quieter + fi.verbose = verbose? && !quieter? fi.debug = debug? fi.prelude oh1 "Installing #{formula.name} dependency: #{Tty.green}#{dep.name}#{Tty.reset}"