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

Merge pull request #11767 from hyuraku/search_desc_by_formula-or-cask

Browse Source 
repair to apply `--formula` and `--cask` options to `brew search  --desc`
This commit is contained in:
Mike McQuaid 2021-07-26 13:13:06 +01:00 committed by GitHub
commit 2f369efba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ module Homebrew
string_or_regex = query_regexp(query) string_or_regex = query_regexp(query)
if args.desc? if args.desc?
search_descriptions(string_or_regex) search_descriptions(string_or_regex, args)
elsif args.pull_request? elsif args.pull_request?
only = if args.open? && !args.closed? only = if args.open? && !args.closed?
"open" "open"

4
Library/Homebrew/extend/os/mac/search.rb
View File

@ -7,11 +7,13 @@ require "cask/cask_loader"
module Homebrew module Homebrew
module Search module Search
module Extension module Extension
def search_descriptions(string_or_regex) def search_descriptions(string_or_regex, args)
super super
puts puts
return if args.formula?
ohai "Casks" ohai "Casks"
Cask::Cask.to_a.extend(Searchable) Cask::Cask.to_a.extend(Searchable)
.search(string_or_regex, &:name) .search(string_or_regex, &:name)

4
Library/Homebrew/search.rb
View File

@ -19,7 +19,9 @@ module Homebrew
raise "#{query} is not a valid regex." raise "#{query} is not a valid regex."
end end
def search_descriptions(string_or_regex) def search_descriptions(string_or_regex, args)
return if args.cask?
ohai "Formulae" ohai "Formulae"
CacheStoreDatabase.use(:descriptions) do |db| CacheStoreDatabase.use(:descriptions) do |db|
cache_store = DescriptionCacheStore.new(db) cache_store = DescriptionCacheStore.new(db)