diff options
| author | Jack Nagel | 2014-11-03 21:34:41 -0600 |
|---|---|---|
| committer | Jack Nagel | 2014-11-03 21:39:11 -0600 |
| commit | 3421308bd47ec8b2ad8f3a8afaced8ad05899fdc (patch) | |
| tree | 812c07418b446daf32546bd38ccc5ce509225108 /Library | |
| parent | 3c9cc18c17d9558cca491253d0e4b7d8f04cd7c8 (diff) | |
| download | brew-3421308bd47ec8b2ad8f3a8afaced8ad05899fdc.tar.bz2 | |
Make git an installer mode
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/install.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 14f6a2a12..dc82e2a7b 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -125,7 +125,7 @@ module Homebrew fi.build_from_source = ARGV.build_from_source? fi.force_bottle = ARGV.force_bottle? fi.interactive = ARGV.interactive? - fi.interactive &&= :git if ARGV.git? + fi.git = ARGV.git? fi.verbose = ARGV.verbose? fi.verbose &&= :quieter if ARGV.quieter? fi.debug = ARGV.debug? diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 98065a92c..b5859df4f 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -30,7 +30,7 @@ class FormulaInstaller attr_accessor :options mode_attr_accessor :show_summary_heading, :show_header 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 def initialize(formula) @@ -42,6 +42,7 @@ class FormulaInstaller @build_bottle = false @force_bottle = false @interactive = false + @git = false @verbose = false @debug = false @options = Options.new @@ -425,11 +426,8 @@ class FormulaInstaller args << "--bottle-arch=#{ARGV.bottle_arch}" if ARGV.bottle_arch end - if interactive? - args << "--interactive" - args << "--git" if interactive == :git - end - + args << "--git" if git? + args << "--interactive" if interactive? args << "--verbose" if verbose? args << "--debug" if debug? args << "--cc=#{ARGV.cc}" if ARGV.cc |