Merge pull request #6326 from MikeMcQuaid/tap-options
cmd/install: fix installing tap formulae with options.
This commit is contained in:
		
						commit
						6db1c7383f
					
				@ -93,6 +93,14 @@ module Homebrew
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def install
 | 
			
		||||
    ARGV.named.each do |name|
 | 
			
		||||
      next if File.exist?(name)
 | 
			
		||||
      next if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX
 | 
			
		||||
 | 
			
		||||
      tap = Tap.fetch(Regexp.last_match(1), Regexp.last_match(2))
 | 
			
		||||
      tap.install unless tap.installed?
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    install_args.parse
 | 
			
		||||
    raise FormulaUnspecifiedError if args.remaining.empty?
 | 
			
		||||
 | 
			
		||||
@ -105,16 +113,6 @@ module Homebrew
 | 
			
		||||
      EOS
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    unless args.force?
 | 
			
		||||
      ARGV.named.each do |name|
 | 
			
		||||
        next if File.exist?(name)
 | 
			
		||||
        next if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX
 | 
			
		||||
 | 
			
		||||
        tap = Tap.fetch(Regexp.last_match(1), Regexp.last_match(2))
 | 
			
		||||
        tap.install unless tap.installed?
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    formulae = []
 | 
			
		||||
 | 
			
		||||
    unless ARGV.casks.empty?
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user