diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index a8a34133c5..4667f36c03 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -817,7 +817,11 @@ module Cask def audit_cask_path return unless cask.tap.core_cask_tap? - expected_path = cask.tap.new_cask_path(cask.token) + expected_path = if cask.artifacts.any?(Artifact::Font) + cask.tap.new_cask_font_path(cask.token) + else + cask.tap.new_cask_path(cask.token) + end return if cask.sourcefile_path.to_s.end_with?(expected_path) diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index 118866ddd0..cc847144cb 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -1401,6 +1401,13 @@ class CoreCaskTap < AbstractCoreTap cask_dir/cask_subdir/"#{token.downcase}.rb" end + sig { params(token: String).returns(Pathname) } + def new_cask_font_path(token) + font_first_letter = T.must(token.split("font-").second)[0].to_s + cask_subdir = "fonts/font-#{font_first_letter}" + cask_dir/cask_subdir/"#{token.downcase}.rb" + end + sig { override.returns(T::Array[Pathname]) } def cask_files return super if Homebrew::EnvConfig.no_install_from_api?