From 8dc060c88b360c26571b2549af46a108fc7a9078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?=
 <70830482+FnControlOption@users.noreply.github.com>
Date: Tue, 21 Sep 2021 11:45:18 -0700
Subject: [PATCH] upgrade: use greedy_* method parameters

---
 Library/Homebrew/cask/cmd/upgrade.rb | 14 +++++++-------
 Library/Homebrew/cmd/upgrade.rb      | 20 +++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb
index 89215e94c5..32be574512 100644
--- a/Library/Homebrew/cask/cmd/upgrade.rb
+++ b/Library/Homebrew/cask/cmd/upgrade.rb
@@ -95,8 +95,8 @@ module Cask
 
         outdated_casks = if casks.empty?
           Caskroom.casks(config: Config.from_args(args)).select do |cask|
-            cask.outdated?(greedy: greedy, greedy_latest: args.greedy_latest?,
-                           greedy_auto_updates: args.greedy_auto_updates?)
+            cask.outdated?(greedy: greedy, greedy_latest: greedy_latest,
+                           greedy_auto_updates: greedy_auto_updates)
           end
         else
           casks.select do |cask|
@@ -120,14 +120,14 @@ module Cask
         return false if outdated_casks.empty?
 
         if casks.empty? && !greedy
-          if !args.greedy_auto_updates? && !args.greedy_latest?
-            ohai "Casks with 'auto_updates true' or 'version :latest'
-            will not be upgraded; pass `--greedy` to upgrade them."
+          if !greedy_auto_updates && !greedy_latest
+            ohai "Casks with 'auto_updates true' or 'version :latest' " \
+                 "will not be upgraded; pass `--greedy` to upgrade them."
           end
-          if args.greedy_auto_updates? && !args.greedy_latest?
+          if greedy_auto_updates && !greedy_latest
             ohai "Casks with 'version :latest' will not be upgraded; pass `--greedy-latest` to upgrade them."
           end
-          if !args.greedy_auto_updates? && args.greedy_latest?
+          if !greedy_auto_updates && greedy_latest
             ohai "Casks with 'auto_updates true' will not be upgraded; pass `--greedy-auto-updates` to upgrade them."
           end
         end
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 715bd8f859..aad5f5aa4a 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -234,15 +234,17 @@ module Homebrew
 
     Cask::Cmd::Upgrade.upgrade_casks(
       *casks,
-      force:          args.force?,
-      greedy:         args.greedy?,
-      dry_run:        args.dry_run?,
-      binaries:       args.binaries?,
-      quarantine:     args.quarantine?,
-      require_sha:    args.require_sha?,
-      skip_cask_deps: args.skip_cask_deps?,
-      verbose:        args.verbose?,
-      args:           args,
+      force:               args.force?,
+      greedy:              args.greedy?,
+      greedy_latest:       args.greedy_latest?,
+      greedy_auto_updates: args.greedy_auto_updates?,
+      dry_run:             args.dry_run?,
+      binaries:            args.binaries?,
+      quarantine:          args.quarantine?,
+      require_sha:         args.require_sha?,
+      skip_cask_deps:      args.skip_cask_deps?,
+      verbose:             args.verbose?,
+      args:                args,
     )
   end
 end