Make FormulaInstaller setup more readable

2 files changed, 21 insertions, 21 deletions

diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 2b1c577f0..a3d7b6452 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -104,17 +104,17 @@ module Homebrew extend self
 
   def install_formula f
     fi = FormulaInstaller.new(f)
-    fi.options = f.build.used_options
-    fi.ignore_deps = ARGV.ignore_deps? || ARGV.interactive?
-    fi.only_deps = ARGV.only_deps?
-    fi.build_bottle = ARGV.build_bottle?
-    fi.build_from_source = ARGV.build_from_source?
-    fi.force_bottle = ARGV.force_bottle?
-    fi.interactive = ARGV.interactive?
-    fi.interactive &&= :git if ARGV.flag? "--git"
-    fi.verbose = ARGV.verbose?
-    fi.verbose &&= :quieter if ARGV.quieter?
-    fi.debug = ARGV.debug?
+    fi.options             = f.build.used_options
+    fi.ignore_deps         = ARGV.ignore_deps? || ARGV.interactive?
+    fi.only_deps           = ARGV.only_deps?
+    fi.build_bottle        = ARGV.build_bottle?
+    fi.build_from_source   = ARGV.build_from_source?
+    fi.force_bottle        = ARGV.force_bottle?
+    fi.interactive         = ARGV.interactive?
+    fi.interactive       &&= :git if ARGV.flag? "--git"
+    fi.verbose             = ARGV.verbose?
+    fi.verbose           &&= :quieter if ARGV.quieter?
+    fi.debug               = ARGV.debug?
     fi.prelude
     fi.install
     fi.caveats
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index adcbf49b6..98406bf6e 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -56,13 +56,13 @@ module Homebrew extend self
   def upgrade_formula f
     outdated_keg = Keg.new(f.linked_keg.realpath) rescue nil
 
-    installer = FormulaInstaller.new(f)
-    installer.options |= Tab.for_formula(f).used_options
-    installer.build_from_source = ARGV.build_from_source?
-    installer.verbose = ARGV.verbose?
-    installer.verbose &&= :quieter if ARGV.quieter?
-    installer.debug = ARGV.debug?
-    installer.prelude
+    fi = FormulaInstaller.new(f)
+    fi.options             = Tab.for_formula(f).used_options
+    fi.build_from_source   = ARGV.build_from_source?
+    fi.verbose             = ARGV.verbose?
+    fi.verbose           &&= :quieter if ARGV.quieter?
+    fi.debug               = ARGV.debug?
+    fi.prelude
 
     oh1 "Upgrading #{f.name}"
 
@@ -71,9 +71,9 @@ module Homebrew extend self
     # do! Seriously, it happens!
     outdated_keg.unlink if outdated_keg
 
-    installer.install
-    installer.caveats
-    installer.finish
+    fi.install
+    fi.caveats
+    fi.finish
 
     # If the formula was pinned, and we were force-upgrading it, unpin and
     # pin it again to get a symlink pointing to the correct keg.