formula_installer: simplify callers.
There's a bunch of duplication going on that's not really necessary.
This commit is contained in:
parent
ac2cbd2137
commit
b8611bd988
@ -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
|
||||
|
||||
@ -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 " "}"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user