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

Support Tap#cask_files when using API.

Browse Source
This commit is contained in:
Markus Reiter 2024-02-20 17:59:32 +01:00
parent 28ad3f7fec
commit 4cf0f79368
No known key found for this signature in database
GPG Key ID: 245293B51702655B
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/diagnostic.rb
View File

@ -936,16 +936,9 @@ module Homebrew
end end
def check_cask_taps def check_cask_taps
default_cask_tap = CoreCaskTap.instance
taps = Tap.select { |t| t.cask_dir.exist? && t != default_cask_tap }
taps.prepend(default_cask_tap) if EnvConfig.no_install_from_api?
error_tap_paths = [] error_tap_paths = []
add_info "Homebrew Cask Taps:", (taps.map do |tap| add_info "Homebrew Cask Taps:", (Tap.map do |tap|
if tap.path.blank?
none_string
else
cask_count = begin cask_count = begin
tap.cask_files.count tap.cask_files.count
rescue rescue
@ -954,7 +947,6 @@ module Homebrew
end end
"#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})" "#{tap.path} (#{Utils.pluralize("cask", cask_count, include_count: true)})"
end
end) end)
taps_string = Utils.pluralize("tap", error_tap_paths.count) taps_string = Utils.pluralize("tap", error_tap_paths.count)

4
Library/Homebrew/tap.rb
View File

@ -1198,9 +1198,9 @@ class CoreCaskTap < AbstractCoreTap
sig { override.returns(T::Array[Pathname]) } sig { override.returns(T::Array[Pathname]) }
def cask_files def cask_files
return super if Homebrew::EnvConfig.no_install_from_api? || installed? return super if Homebrew::EnvConfig.no_install_from_api?
raise TapUnavailableError, name cask_files_by_name.values
end end
sig { override.returns(T::Array[String]) } sig { override.returns(T::Array[String]) }