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

formula_installer: simplify callers.

3 files changed, 0 insertions, 13 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