From 2d231a34785d9e452f2ba7f80b4f536c924eb782 Mon Sep 17 00:00:00 2001 From: Mohammad Zain Abbas Date: Mon, 18 Jul 2022 14:49:32 +0200 Subject: [PATCH] More compact way to get livecheckable resources --- .gitignore | 2 +- .vscode/settings.json | 4 +++- Library/Homebrew/dev-cmd/livecheck.rb | 5 ++--- Library/Taps/homebrew/homebrew-core | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) create mode 160000 Library/Taps/homebrew/homebrew-core diff --git a/.gitignore b/.gitignore index 8f52acf25c..76d5c48355 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ /Library/Homebrew/test/junit /Library/Homebrew/test/fs_leak_log /Library/Homebrew/vendor/portable-ruby -/Library/Taps +#/Library/Taps /Library/PinnedTaps /Library/Homebrew/.byebug_history /Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt diff --git a/.vscode/settings.json b/.vscode/settings.json index 865fc53af2..fe8a066e21 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,5 +23,7 @@ "editor.codeActionsOnSave": { "source.fixAll.shellcheck": true, } - } + }, + "git.mergeEditor": true, + "merge-conflict.autoNavigateNextConflict.enabled": true } diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb index c34ef48b7d..ff1bbfa65b 100644 --- a/Library/Homebrew/dev-cmd/livecheck.rb +++ b/Library/Homebrew/dev-cmd/livecheck.rb @@ -70,8 +70,7 @@ module Homebrew casks = args.formula? ? [] : Cask::Caskroom.casks formulae + casks elsif args.resources? - formula_with_livecheckable_resources = Formula.all.select { |formula| formula.resources.any? { |resource| resource.livecheckable? } } - livecheckable_resources = formula_with_livecheckable_resources.map { |formula| formula.resources }.flatten.filter{ |resource| resource.livecheckable? } + livecheckable_resources = Formula.all.map { |formula| formula.resources }.flatten.filter{ |resource| resource.livecheckable? } livecheckable_resources elsif args.all? formulae = args.cask? ? [] : Formula.all @@ -121,6 +120,6 @@ module Homebrew verbose: args.verbose?, }.compact - # Livecheck.run_checks(formulae_and_casks_to_check, **options) + Livecheck.run_checks(formulae_and_casks_to_check, **options) end end diff --git a/Library/Taps/homebrew/homebrew-core b/Library/Taps/homebrew/homebrew-core new file mode 160000 index 0000000000..88b2623dd6 --- /dev/null +++ b/Library/Taps/homebrew/homebrew-core @@ -0,0 +1 @@ +Subproject commit 88b2623dd6ff0dec391029b1f43107438935f4b7