From 5beb7c177214e4e5774c4318c5f79a8bde39342a Mon Sep 17 00:00:00 2001 From: Mohammad Zain Abbas Date: Sun, 31 Jul 2022 09:35:41 +0200 Subject: [PATCH] Simplified check resources' condition for Formulae --- Library/Homebrew/livecheck/livecheck.rb | 33 +++++++++++-------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb index d2976bff3c..4bdceab01b 100644 --- a/Library/Homebrew/livecheck/livecheck.rb +++ b/Library/Homebrew/livecheck/livecheck.rb @@ -284,28 +284,23 @@ module Homebrew end # Check current and latest resources (if "--resources" flag is given) - if check_resources + # Only check current and latest versions if we have resources to check against + if check_resources && formula_or_cask.resources.present? + current_resources = formula_or_cask.resources.map do |resource| + { name: resource.name, version: resource.version, livecheckable: resource.livecheckable? } + end - has_resources = formula_or_cask.resources.any? + resource_version_info = resource_version( + formula_or_cask, + json: json, + full_name: use_full_name, + verbose: verbose, + debug: debug, + ) - # Only check current and latest versions if we have resources to check against - if has_resources + latest_resources = resource_version_info.map do |resource| + { name: resource[:resource], version: resource[:version][:latest] } - current_resources = formula_or_cask.resources.map do |resource| - { name: resource.name, version: resource.version, livecheckable: resource.livecheckable? } - end - - resource_version_info = resource_version( - formula_or_cask, - json: json, - full_name: use_full_name, - verbose: verbose, - debug: debug, - ) - - latest_resources = resource_version_info.map do |resource| - { name: resource[:resource], version: resource[:version][:latest] } - end end if latest.blank?