Skip to content

Refactor search_formulae. #4307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reitermarkus merged 1 commit into from
Jun 7, 2018
+5 −6
Merged

Refactor search_formulae. #4307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Library/Homebrew/search.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,17 @@ def search_formulae(string_or_regex)
.sort

results.map do |name|
begin
formula = Formulary.factory(name)
canonical_name = formula.name
canonical_full_name = formula.full_name
formula, canonical_full_name = begin
f = Formulary.factory(name)
[f, f.full_name]
rescue
canonical_name = canonical_full_name = name
[nil, name]
end

# Ignore aliases from results when the full name was also found
next if aliases.include?(name) && results.include?(canonical_full_name)

if (HOMEBREW_CELLAR/canonical_name).directory?
if formula&.any_version_installed?
pretty_installed(name)
else
name
Expand Down