ARGV#resolved_formulae: check whether input is a formula file

This commit is contained in:
Xu Cheng 2016-07-16 20:58:56 +08:00
parent 1eaa95b805
commit f811a45fe4
No known key found for this signature in database
GPG Key ID: C2A3860FA0B459CE

View File

@ -25,7 +25,7 @@ module HomebrewArgvExtension
def resolved_formulae def resolved_formulae
require "formula" require "formula"
@resolved_formulae ||= (downcased_unique_named - casks).map do |name| @resolved_formulae ||= (downcased_unique_named - casks).map do |name|
if name.include?("/") if name.include?("/") || File.exist?(name)
f = Formulary.factory(name, spec) f = Formulary.factory(name, spec)
if f.any_version_installed? if f.any_version_installed?
tab = Tab.for_formula(f) tab = Tab.for_formula(f)
@ -254,7 +254,7 @@ module HomebrewArgvExtension
def downcased_unique_named def downcased_unique_named
# Only lowercase names, not paths, bottle filenames or URLs # Only lowercase names, not paths, bottle filenames or URLs
@downcased_unique_named ||= named.map do |arg| @downcased_unique_named ||= named.map do |arg|
if arg.include?("/") || arg.end_with?(".tar.gz") if arg.include?("/") || arg.end_with?(".tar.gz") || File.exist?(arg)
arg arg
else else
arg.downcase arg.downcase