Merge pull request #2959 from MikeMcQuaid/formula-installer-duplication

formula_installer: simplify callers.

4 files changed, 8 insertions, 20 deletions

diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index da48582d2..c00087705 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -330,13 +330,8 @@ module Homebrew
     fi.ignore_deps          = ARGV.ignore_deps?
     fi.only_deps            = ARGV.only_deps?
     fi.build_bottle         = ARGV.build_bottle?
-    fi.build_from_source    = ARGV.build_from_source? || ARGV.build_all_from_source?
-    fi.force_bottle         = ARGV.force_bottle?
     fi.interactive          = ARGV.interactive?
     fi.git                  = ARGV.git?
-    fi.verbose              = ARGV.verbose?
-    fi.quieter              = ARGV.quieter?
-    fi.debug                = ARGV.debug?
     fi.prelude
     fi.install
     fi.finish
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index f5d6437bd..98160579e 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -35,12 +35,8 @@ module Homebrew
     fi.options              = options
     fi.invalid_option_names = build_options.invalid_option_names
     fi.build_bottle         = ARGV.build_bottle? || (!f.bottled? && f.build.bottle?)
-    fi.build_from_source    = ARGV.build_from_source? || ARGV.build_all_from_source?
-    fi.force_bottle         = ARGV.force_bottle?
     fi.interactive          = ARGV.interactive?
     fi.git                  = ARGV.git?
-    fi.verbose              = ARGV.verbose?
-    fi.debug                = ARGV.debug?
     fi.prelude
 
     oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}"
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index d007ff8c8..548c3b6ed 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -116,10 +116,6 @@ module Homebrew
     fi.options  = f.build.used_options
     fi.options &= f.options
     fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
-    fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
-    fi.verbose = ARGV.verbose?
-    fi.quieter = ARGV.quieter?
-    fi.debug   = ARGV.debug?
     fi.installed_on_request = !ARGV.named.empty?
     if tab
       fi.installed_as_dependency = tab.installed_as_dependency
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 6830419fe..9af8976bc 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -44,14 +44,14 @@ class FormulaInstaller
     @show_header = false
     @ignore_deps = false
     @only_deps = false
-    @build_from_source = false
-    @build_bottle = false
-    @force_bottle = false
+    @build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
+    @build_bottle = ARGV.build_bottle?
+    @force_bottle = ARGV.force_bottle?
     @interactive = false
     @git = false
-    @verbose = false
-    @quieter = false
-    @debug = false
+    @verbose = ARGV.verbose?
+    @quieter = ARGV.quieter?
+    @debug = ARGV.debug?
     @installed_as_dependency = false
     @installed_on_request = true
     @options = Options.new
@@ -539,7 +539,8 @@ class FormulaInstaller
     fi.options           |= inherited_options
     fi.options           &= df.options
     fi.build_from_source  = ARGV.build_formula_from_source?(df)
-    fi.verbose            = verbose? && !quieter?
+    fi.verbose            = verbose?
+    fi.quieter            = quieter?
     fi.debug              = debug?
     fi.installed_as_dependency = true
     fi.installed_on_request = false