admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Make git an installer mode

Browse Source
This commit is contained in:
Jack Nagel 2014-11-03 21:34:41 -06:00
parent 3c9cc18c17
commit 3421308bd4
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/install.rb
View File

@ -125,7 +125,7 @@ module Homebrew
fi.build_from_source = ARGV.build_from_source? fi.build_from_source = ARGV.build_from_source?
fi.force_bottle = ARGV.force_bottle? fi.force_bottle = ARGV.force_bottle?
fi.interactive = ARGV.interactive? fi.interactive = ARGV.interactive?
fi.interactive &&= :git if ARGV.git? fi.git = ARGV.git?
fi.verbose = ARGV.verbose? fi.verbose = ARGV.verbose?
fi.verbose &&= :quieter if ARGV.quieter? fi.verbose &&= :quieter if ARGV.quieter?
fi.debug = ARGV.debug? fi.debug = ARGV.debug?

10
Library/Homebrew/formula_installer.rb
View File

@ -30,7 +30,7 @@ class FormulaInstaller
attr_accessor :options attr_accessor :options
mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :show_summary_heading, :show_header
mode_attr_accessor :build_from_source, :build_bottle, :force_bottle mode_attr_accessor :build_from_source, :build_bottle, :force_bottle
mode_attr_accessor :ignore_deps, :only_deps, :interactive mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
mode_attr_accessor :verbose, :debug mode_attr_accessor :verbose, :debug
def initialize(formula) def initialize(formula)
@ -42,6 +42,7 @@ class FormulaInstaller
@build_bottle = false @build_bottle = false
@force_bottle = false @force_bottle = false
@interactive = false @interactive = false
@git = false
@verbose = false @verbose = false
@debug = false @debug = false
@options = Options.new @options = Options.new
@ -425,11 +426,8 @@ class FormulaInstaller
args << "--bottle-arch=#{ARGV.bottle_arch}" if ARGV.bottle_arch args << "--bottle-arch=#{ARGV.bottle_arch}" if ARGV.bottle_arch
end end
if interactive? args << "--git" if git?
args << "--interactive" args << "--interactive" if interactive?
args << "--git" if interactive == :git
end
args << "--verbose" if verbose? args << "--verbose" if verbose?
args << "--debug" if debug? args << "--debug" if debug?
args << "--cc=#{ARGV.cc}" if ARGV.cc args << "--cc=#{ARGV.cc}" if ARGV.cc