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

Refactor search_formulae.

Browse Source
This commit is contained in:
Markus Reiter 2018-06-07 17:57:26 +02:00
parent 1433a2a83e
commit 535babee97
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/search.rb
View File

@ -62,18 +62,17 @@ module Homebrew
.sort .sort
results.map do |name| results.map do |name|
begin formula, canonical_full_name = begin
formula = Formulary.factory(name) f = Formulary.factory(name)
canonical_name = formula.name [f, f.full_name]
canonical_full_name = formula.full_name
rescue rescue
canonical_name = canonical_full_name = name [nil, name]
end end
# Ignore aliases from results when the full name was also found # Ignore aliases from results when the full name was also found
next if aliases.include?(name) && results.include?(canonical_full_name) next if aliases.include?(name) && results.include?(canonical_full_name)
if (HOMEBREW_CELLAR/canonical_name).directory? if formula&.any_version_installed?
pretty_installed(name) pretty_installed(name)
else else
name name