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

search: use full name to filter aliases result

Browse Source
This commit is contained in:
Xu Cheng 2015-09-13 21:27:49 +08:00
parent bd4525b64a
commit 8a30f315d9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cmd/search.rb
View File

@ -139,12 +139,13 @@ module Homebrew
def search_formulae(rx) def search_formulae(rx)
aliases = Formula.alias_full_names aliases = Formula.alias_full_names
results = (Formula.full_names+aliases).grep(rx).sort results = (Formula.full_names+aliases).grep(rx).sort
result_names = results.map { |name| name.split("/")[-1] }.uniq
results.map do |name| results.map do |name|
canonical_name = Formulary.canonical_name(name) formula = Formulary.factory(name)
canonical_name = formula.name
canonical_full_name = formula.full_name
# Ignore aliases from results when the full name was also found # Ignore aliases from results when the full name was also found
if aliases.include?(name) && result_names.include?(canonical_name) if aliases.include?(name) && results.include?(canonical_full_name)
next next
elsif (HOMEBREW_CELLAR/canonical_name).directory? elsif (HOMEBREW_CELLAR/canonical_name).directory?
"#{name} (installed)" "#{name} (installed)"