From 0ea2c5f15baebb37aeea59ce7c4d0708242bd123 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 20 May 2020 10:05:23 +0100
Subject: [PATCH] os/mac/diagnostic: suggest untapping phinze/cask.

As seen in https://github.com/Homebrew/brew/issues/7605.
---
 Library/Homebrew/extend/os/mac/diagnostic.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 6e18a917bd..fe0bf0d5be 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -347,12 +347,13 @@ module Homebrew
       end
 
       def check_deprecated_caskroom_taps
-        tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" }.map(&:repo)
+        tapped_caskroom_taps = Tap.select { |t| t.user == "caskroom" || t.name == "phinze/cask" }
+                                  .map(&:name)
         return if tapped_caskroom_taps.empty?
 
         <<~EOS
           You have the following deprecated, cask taps tapped:
-            Caskroom/homebrew-#{tapped_caskroom_taps.join("\n  Caskroom/homebrew-")}
+            #{tapped_caskroom_taps.join("\n  ")}
           Untap them with `brew untap`.
         EOS
       end