diff options
| author | Markus Reiter | 2017-04-20 05:50:52 +0200 |
|---|---|---|
| committer | GitHub | 2017-04-20 05:50:52 +0200 |
| commit | a264590201dac1c03c10cfef8f50a41aa14ecd18 (patch) | |
| tree | ded23c4a20ca10d7ad5de3a6951ed16b5f80363f | |
| parent | 62cc258ba7cee69d9dcbf0a6151441af840c14bf (diff) | |
| parent | 6ce84c4fb8a4a6910fe05848e0c732d02c84e8cf (diff) | |
| download | brew-a264590201dac1c03c10cfef8f50a41aa14ecd18.tar.bz2 | |
Merge pull request #2254 from reitermarkus/lowercase-caskroom
Lowercase `caskroom` and add missing Taps.
| -rw-r--r-- | Library/Homebrew/cmd/search.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/official_taps.rb | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb index 443739f8c..20221524a 100644 --- a/Library/Homebrew/cmd/search.rb +++ b/Library/Homebrew/cmd/search.rb @@ -100,10 +100,8 @@ module Homebrew raise SEARCH_ERROR_QUEUE.pop unless SEARCH_ERROR_QUEUE.empty? end - SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } + [ - %w[Caskroom cask], - %w[Caskroom versions], - ] + SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } + + OFFICIAL_CASK_TAPS.map { |tap| ["caskroom", tap] } def query_regexp(query) case query @@ -126,7 +124,7 @@ module Homebrew regex = regex_or_string.is_a?(String) ? /^#{Regexp.escape(regex_or_string)}$/ : regex_or_string if (HOMEBREW_LIBRARY/"Taps/#{user.downcase}/homebrew-#{repo.downcase}").directory? && \ - user != "Caskroom" + user != "caskroom" return [] end diff --git a/Library/Homebrew/official_taps.rb b/Library/Homebrew/official_taps.rb index a7bc4a1d6..e069e5265 100644 --- a/Library/Homebrew/official_taps.rb +++ b/Library/Homebrew/official_taps.rb @@ -5,6 +5,11 @@ OFFICIAL_TAPS = %w[ science ].freeze +OFFICIAL_CASK_TAPS = %w[ + cask + versions +].freeze + OFFICIAL_CMD_TAPS = { "homebrew/bundle" => ["bundle"], "homebrew/test-bot" => ["test-bot"], |