diff options
| author | Mike McQuaid | 2017-07-28 15:27:47 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-07-28 15:27:47 +0100 |
| commit | b8611bd988c463fe4d55445910333935a7f16238 (patch) | |
| tree | fe69bd25a46ae86ac81960ef7b80ea2a79489fdf /Library/Homebrew/formula_installer.rb | |
| parent | ac2cbd2137006ebfe84d8584ccdcb5d78c1130d9 (diff) | |
| download | brew-b8611bd988c463fe4d55445910333935a7f16238.tar.bz2 | |
formula_installer: simplify callers.
There's a bunch of duplication going on that's not really necessary.
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index a0c091e7f..1d4d40e24 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 |