Use official? for checking tap.

This commit is contained in:
Markus Reiter 2020-09-05 04:13:07 +02:00
parent 05cf8f42e0
commit 6194155765

View File

@ -395,7 +395,7 @@ module Cask
add_warning "cask token contains .app" if token.end_with? ".app" add_warning "cask token contains .app" if token.end_with? ".app"
if /-(?<designation>alpha|beta|rc|release-candidate)$/ =~ cask.token && if /-(?<designation>alpha|beta|rc|release-candidate)$/ =~ cask.token &&
cask.tap.official? && cask.tap&.official? &&
cask.tap != "homebrew/cask-versions" cask.tap != "homebrew/cask-versions"
add_warning "cask token contains version designation '#{designation}'" add_warning "cask token contains version designation '#{designation}'"
end end
@ -562,7 +562,7 @@ module Cask
end end
def check_denylist def check_denylist
return if cask.tap&.user != "Homebrew" return unless cask.tap&.official?
return unless reason = Denylist.reason(cask.token) return unless reason = Denylist.reason(cask.token)
add_error "#{cask.token} is not allowed: #{reason}" add_error "#{cask.token} is not allowed: #{reason}"