From 9e2c5910c5d9dda0ed200d947af7bbb69c6386e1 Mon Sep 17 00:00:00 2001
From: Phoenix Eliot <phoenixjeliot@gmail.com>
Date: Tue, 8 Feb 2022 12:08:32 -0500
Subject: [PATCH] Simplify 'brew cask' check

---
 Library/Homebrew/brew.rb     | 7 +++----
 Library/Homebrew/commands.rb | 7 -------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index 865fefda9f..d1d342cfcd 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -86,10 +86,6 @@ begin
   require "commands"
   require "settings"
 
-  # Print an error message and exit if the command is no longer supported
-  unsupported_cmd_message = Commands.unsupported_cmd?(cmd)
-  odie unsupported_cmd_message if unsupported_cmd_message
-
   internal_cmd = Commands.valid_internal_cmd?(cmd) || Commands.valid_internal_dev_cmd?(cmd) if cmd
 
   unless internal_cmd
@@ -125,6 +121,9 @@ begin
     possible_tap = Tap.fetch(possible_tap.first) if possible_tap
 
     if !possible_tap || possible_tap.installed? || Tap.untapped_official_taps.include?(possible_tap.name)
+      if cmd == 'cask' # Check for cask explicitly because it's very common in old guides
+        odie "`brew cask <command>` is no longer supported. Use `brew <command> --cask` instead."
+      end
       odie "Unknown command: #{cmd}"
     end
 
diff --git a/Library/Homebrew/commands.rb b/Library/Homebrew/commands.rb
index c67e5dbeff..e9450b3fed 100644
--- a/Library/Homebrew/commands.rb
+++ b/Library/Homebrew/commands.rb
@@ -30,13 +30,6 @@ module Commands
     "lc"          => "livecheck",
     "tc"          => "typecheck",
   }.freeze
-  HOMEBREW_UNSUPPORTED_COMMAND_MESSAGES = {
-    "cask" => "`brew cask <command>` is no longer supported. Use `brew <command> --cask` instead.",
-  }.freeze
-
-  def unsupported_cmd?(cmd)
-    HOMEBREW_UNSUPPORTED_COMMAND_MESSAGES.fetch(cmd, nil)
-  end
 
   def valid_internal_cmd?(cmd)
     require?(HOMEBREW_CMD_PATH/cmd)