aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-11-03 21:36:01 -0600
committerJack Nagel2014-11-03 21:43:11 -0600
commit8e51052b8b1b5c828df43ee32d814ba43d053d7e (patch)
tree3b17851f05f3d466e6f9811d34a3d252b2797590
parentbd30f311ef2655c908197c1ef06f705261d9e465 (diff)
downloadhomebrew-8e51052b8b1b5c828df43ee32d814ba43d053d7e.tar.bz2
Make quieter an installer mode
-rw-r--r--Library/Homebrew/cmd/install.rb2
-rw-r--r--Library/Homebrew/cmd/upgrade.rb2
-rw-r--r--Library/Homebrew/formula_installer.rb5
3 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index dc82e2a7b..eb93d380b 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 c5b875d31..352a4d340 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 b5859df4f..80d2f5aae 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}"