Make quieter an installer mode

This commit is contained in:
Jack Nagel 2014-11-03 21:36:01 -06:00
parent 3421308bd4
commit e1bfbad810
3 changed files with 5 additions and 4 deletions

View File

@ -127,7 +127,7 @@ module Homebrew
fi.interactive = ARGV.interactive? fi.interactive = ARGV.interactive?
fi.git = ARGV.git? fi.git = ARGV.git?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.verbose &&= :quieter if ARGV.quieter? fi.quieter = ARGV.quieter?
fi.debug = ARGV.debug? fi.debug = ARGV.debug?
fi.prelude fi.prelude
fi.install fi.install

View File

@ -56,7 +56,7 @@ module Homebrew
fi.build_bottle = ARGV.build_bottle? || tab.build_bottle? fi.build_bottle = ARGV.build_bottle? || tab.build_bottle?
fi.build_from_source = ARGV.build_from_source? fi.build_from_source = ARGV.build_from_source?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.verbose &&= :quieter if ARGV.quieter? fi.quieter = ARGV.quieter?
fi.debug = ARGV.debug? fi.debug = ARGV.debug?
fi.prelude fi.prelude

View File

@ -31,7 +31,7 @@ class FormulaInstaller
mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :show_summary_heading, :show_header
mode_attr_accessor :build_from_source, :build_bottle, :force_bottle mode_attr_accessor :build_from_source, :build_bottle, :force_bottle
mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
mode_attr_accessor :verbose, :debug mode_attr_accessor :verbose, :debug, :quieter
def initialize(formula) def initialize(formula)
@formula = formula @formula = formula
@ -44,6 +44,7 @@ class FormulaInstaller
@interactive = false @interactive = false
@git = false @git = false
@verbose = false @verbose = false
@quieter = false
@debug = false @debug = false
@options = Options.new @options = Options.new
@ -352,7 +353,7 @@ class FormulaInstaller
fi.options |= dep.options fi.options |= dep.options
fi.options |= inherited_options fi.options |= inherited_options
fi.build_from_source = build_from_source? fi.build_from_source = build_from_source?
fi.verbose = verbose? unless verbose == :quieter fi.verbose = verbose? && !quieter?
fi.debug = debug? fi.debug = debug?
fi.prelude fi.prelude
oh1 "Installing #{formula.name} dependency: #{Tty.green}#{dep.name}#{Tty.reset}" oh1 "Installing #{formula.name} dependency: #{Tty.green}#{dep.name}#{Tty.reset}"