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

Merge pull request #6038 from GauthamGoli/extract-args-fix

Browse Source 
extract: Replace ARGV.named with args.remaining
This commit is contained in:
Mike McQuaid 2019-04-19 17:40:55 +09:00 committed by GitHub
commit d42f562d45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/extract.rb
View File

@ -96,10 +96,10 @@ module Homebrew
extract_args.parse
# Expect exactly two named arguments: formula and tap
raise UsageError if ARGV.named.length != 2
raise UsageError if args.remaining.length != 2
if ARGV.named.first !~ HOMEBREW_TAP_FORMULA_REGEX
name = ARGV.named.first.downcase
if args.remaining.first !~ HOMEBREW_TAP_FORMULA_REGEX
name = args.remaining.first.downcase
source_tap = CoreTap.instance
else
name = Regexp.last_match(3).downcase
@ -107,7 +107,7 @@ module Homebrew
raise TapFormulaUnavailableError.new(source_tap, name) unless source_tap.installed?
end
destination_tap = Tap.fetch(ARGV.named.second)
destination_tap = Tap.fetch(args.remaining.second)
odie "Cannot extract formula to homebrew/core!" if destination_tap.core_tap?
odie "Cannot extract formula to the same tap!" if destination_tap == source_tap
destination_tap.install unless destination_tap.installed?