diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb index 80116b339a..d40e8f2836 100644 --- a/Library/Homebrew/cli/named_args.rb +++ b/Library/Homebrew/cli/named_args.rb @@ -209,8 +209,8 @@ module Homebrew end sig { returns(T::Array[Keg]) } - def to_kegs - @to_kegs ||= begin + def to_keg + @to_keg ||= begin to_formulae_and_casks(only: :formula, method: :keg).freeze rescue NoSuchKegError => e if (reason = MissingFormula.suggest_command(e.name, "uninstall")) diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 4132d9bf16..60e4d8af5b 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -129,9 +129,9 @@ module Homebrew safe_system "ls", *ls_args, Cask::Caskroom.path end elsif args.verbose? || !$stdout.tty? - system_command! "find", args: args.named.to_kegs.map(&:to_s) + %w[-not -type d -print], print_stdout: true + system_command! "find", args: args.named.to_keg.map(&:to_s) + %w[-not -type d -print], print_stdout: true else - args.named.to_kegs.each { |keg| PrettyListing.new keg } + args.named.to_keg.each { |keg| PrettyListing.new keg } end end diff --git a/Library/Homebrew/cmd/unlink.rb b/Library/Homebrew/cmd/unlink.rb index fd8bf4ebf8..71258007ea 100644 --- a/Library/Homebrew/cmd/unlink.rb +++ b/Library/Homebrew/cmd/unlink.rb @@ -31,7 +31,7 @@ module Homebrew options = { dry_run: args.dry_run?, verbose: args.verbose? } - args.named.to_kegs.each do |keg| + args.named.to_keg.each do |keg| if args.dry_run? puts "Would remove:" keg.unlink(**options) diff --git a/Library/Homebrew/dev-cmd/linkage.rb b/Library/Homebrew/dev-cmd/linkage.rb index d907aee83f..bc0bd382e1 100644 --- a/Library/Homebrew/dev-cmd/linkage.rb +++ b/Library/Homebrew/dev-cmd/linkage.rb @@ -35,10 +35,10 @@ module Homebrew args = linkage_args.parse CacheStoreDatabase.use(:linkage) do |db| - kegs = if args.named.to_kegs.empty? + kegs = if args.named.to_keg.empty? Formula.installed.map(&:any_installed_keg).reject(&:nil?) else - args.named.to_kegs + args.named.to_keg end kegs.each do |keg| ohai "Checking #{keg.name} linkage" if kegs.size > 1