Merge pull request #6326 from MikeMcQuaid/tap-options

cmd/install: fix installing tap formulae with options.
This commit is contained in:
Mike McQuaid 2019-07-26 11:04:19 +01:00 committed by GitHub
commit 6db1c7383f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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?