From 9e0a54fd37a5346c8c10e1101b5b5eb00f24b9ea Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 6 Dec 2020 17:47:41 +0100 Subject: [PATCH] Reuse `curl_http_content_headers_and_checksum` for appcast audit. --- Library/Homebrew/cask/audit.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index 279bbad1f8..79985e040c 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -515,12 +515,12 @@ module Cask return if cask.appcast.to_s.empty? return if cask.appcast.must_contain == :no_check - appcast_stanza = cask.appcast.to_s - appcast_contents, = begin - curl_output("--compressed", "--user-agent", HOMEBREW_USER_AGENT_FAKE_SAFARI, "--location", - "--globoff", "--max-time", "5", appcast_stanza) + appcast_url = cask.appcast.to_s + begin + details = curl_http_content_headers_and_checksum(appcast_url, user_agent: HOMEBREW_USER_AGENT_FAKE_SAFARI) + appcast_contents = details[:file] rescue - add_error "appcast at URL '#{appcast_stanza}' offline or looping" + add_error "appcast at URL '#{appcast_url}' offline or looping" return end @@ -528,7 +528,7 @@ module Cask adjusted_version_stanza = cask.appcast.must_contain.presence || version_stanza.match(/^[[:alnum:].]+/)[0] return if appcast_contents.include? adjusted_version_stanza - add_error "appcast at URL '#{appcast_stanza}' does not contain"\ + add_error "appcast at URL '#{appcast_url}' does not contain"\ " the version number '#{adjusted_version_stanza}':\n#{appcast_contents}" end