From 41461b2c00cadaf4cb62ab0b85445c950c259698 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 28 Jul 2019 14:50:59 +0100
Subject: [PATCH] upgrade: tweak --dry-run wording.

---
 Library/Homebrew/cask/cmd/upgrade.rb | 6 +++---
 Library/Homebrew/cmd/upgrade.rb      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb
index 77529012b9..968e8ca95f 100644
--- a/Library/Homebrew/cask/cmd/upgrade.rb
+++ b/Library/Homebrew/cask/cmd/upgrade.rb
@@ -33,7 +33,8 @@ module Cask
         end
 
         ohai "Casks with `auto_updates` or `version :latest` will not be upgraded" if args.empty? && !greedy?
-        oh1 "Upgrading #{outdated_casks.count} #{"outdated package".pluralize(outdated_casks.count)}:"
+        verb = dry_run? ? "Would upgrade" : "Upgrading"
+        oh1 "#{verb} #{outdated_casks.count} #{"outdated package".pluralize(outdated_casks.count)}:"
         caught_exceptions = []
 
         upgradable_casks = outdated_casks.map { |c| [CaskLoader.load(c.installed_caskfile), c] }
@@ -41,8 +42,7 @@ module Cask
         puts upgradable_casks
           .map { |(old_cask, new_cask)| "#{new_cask.full_name} #{old_cask.version} -> #{new_cask.version}" }
           .join(", ")
-
-        return puts "Dry run: did not upgrade anything." if dry_run?
+        return if dry_run?
 
         upgradable_casks.each do |(old_cask, new_cask)|
           begin
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index f0acf672fb..6899c2bc34 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -95,7 +95,8 @@ module Homebrew
     if formulae_to_install.empty?
       oh1 "No packages to upgrade"
     else
-      oh1 "Upgrading #{formulae_to_install.count} outdated #{"package".pluralize(formulae_to_install.count)}:"
+      verb = args.dry_run? ? "Would upgrade" : "Upgrading"
+      oh1 "#{verb} #{formulae_to_install.count} outdated #{"package".pluralize(formulae_to_install.count)}:"
       formulae_upgrades = formulae_to_install.map do |f|
         if f.optlinked?
           "#{f.full_specified_name} #{Keg.new(f.opt_prefix).version} -> #{f.pkg_version}"
@@ -105,8 +106,7 @@ module Homebrew
       end
       puts formulae_upgrades.join(", ")
     end
-
-    return puts "Dry run: did not upgrade anything." if args.dry_run?
+    return if args.dry_run?
 
     upgrade_formulae(formulae_to_install)