From 3df4fa6803a030213557efc8a31acdee0d66318f Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 20 Jun 2023 22:37:39 +0900 Subject: [PATCH 1/2] remove cask's depencies from brew/leaves --- Library/Homebrew/cmd/leaves.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/leaves.rb b/Library/Homebrew/cmd/leaves.rb index 76fb8784ca..72241fb95d 100644 --- a/Library/Homebrew/cmd/leaves.rb +++ b/Library/Homebrew/cmd/leaves.rb @@ -11,7 +11,7 @@ module Homebrew def leaves_args Homebrew::CLI::Parser.new do description <<~EOS - List installed formulae that are not dependencies of another installed formula. + List installed formulae that are not dependencies of another installed formula and cask. EOS switch "-r", "--installed-on-request", description: "Only list leaves that were manually installed." @@ -36,7 +36,10 @@ module Homebrew args = leaves_args.parse leaves_list = Formula.installed - Formula.installed.flat_map(&:runtime_formula_dependencies) - + casks_runtime_dependencies = Cask::Caskroom.casks.flat_map do |cask| + CaskDependent.new(cask).runtime_dependencies.map(&:to_formula) + end + leaves_list -= casks_runtime_dependencies leaves_list.select!(&method(:installed_on_request?)) if args.installed_on_request? leaves_list.select!(&method(:installed_as_dependency?)) if args.installed_as_dependency? From 5424cdfffdb72f9a222657319966abf38fd2a8cc Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 20 Jun 2023 14:43:42 +0100 Subject: [PATCH 2/2] cmd/leaves: tweak wording. --- Library/Homebrew/cmd/leaves.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/leaves.rb b/Library/Homebrew/cmd/leaves.rb index 72241fb95d..e3a3237247 100644 --- a/Library/Homebrew/cmd/leaves.rb +++ b/Library/Homebrew/cmd/leaves.rb @@ -11,7 +11,7 @@ module Homebrew def leaves_args Homebrew::CLI::Parser.new do description <<~EOS - List installed formulae that are not dependencies of another installed formula and cask. + List installed formulae that are not dependencies of another installed formula or cask. EOS switch "-r", "--installed-on-request", description: "Only list leaves that were manually installed."