Merge pull request #3706 from MikeMcQuaid/deprecation-fixes

Deprecation fixes and cleanup

3 files changed, 5 insertions, 33 deletions

diff --git a/Library/Homebrew/cmd/linkapps.rb b/Library/Homebrew/cmd/linkapps.rb
index e8d482529..1bec67a04 100644
--- a/Library/Homebrew/cmd/linkapps.rb
+++ b/Library/Homebrew/cmd/linkapps.rb
@@ -1,3 +1,4 @@
+#: @hide_from_man_page
 #:  * `linkapps` [`--local`] [<formulae>]:
 #:    Find installed formulae that provide `.app`-style macOS apps and symlink them
 #:    into `/Applications`, allowing for easier access (deprecated).
@@ -6,11 +7,6 @@
 #:    either aliases or symlinks and Homebrew formulae do not build "proper" `.app`
 #:    bundles that can be relocated. Instead, please consider using `brew cask` and
 #:    migrate formulae using `.app`s to casks.
-#:
-#:    If no <formulae> are provided, all of them will have their apps symlinked.
-#:
-#:    If provided, `--local` will symlink them into the user's `~/Applications`
-#:    directory instead of the system directory.
 
 require "keg"
 require "formula"
@@ -19,14 +15,7 @@ module Homebrew
   module_function
 
   def linkapps
-    opoo <<~EOS
-      `brew linkapps` has been deprecated and will eventually be removed!
-
-      Unfortunately `brew linkapps` cannot behave nicely with e.g. Spotlight using
-      either aliases or symlinks and Homebrew formulae do not build "proper" `.app`
-      bundles that can be relocated. Instead, please consider using `brew cask` and
-      migrate formulae using `.app`s to casks.
-    EOS
+    odeprecated "'brew linkapps'"
 
     target_dir = linkapps_target(local: ARGV.include?("--local"))
 
diff --git a/Library/Homebrew/cmd/unlinkapps.rb b/Library/Homebrew/cmd/unlinkapps.rb
index 7f401aaeb..721e4d639 100644
--- a/Library/Homebrew/cmd/unlinkapps.rb
+++ b/Library/Homebrew/cmd/unlinkapps.rb
@@ -1,3 +1,4 @@
+#: @hide_from_man_page
 #:  * `unlinkapps` [`--local`] [`--dry-run`] [<formulae>]:
 #:    Remove symlinks created by `brew linkapps` from `/Applications` (deprecated).
 #:
@@ -5,14 +6,6 @@
 #:    either aliases or symlinks and Homebrew formulae do not build "proper" `.app`
 #:    bundles that can be relocated. Instead, please consider using `brew cask` and
 #:    migrate formulae using `.app`s to casks.
-#:
-#:    If no <formulae> are provided, all linked apps will be removed.
-#:
-#:    If provided, `--local` will remove symlinks from the user's `~/Applications`
-#:    directory instead of the system directory.
-#:
-#:    If `--dry-run` or `-n` is passed, Homebrew will list all symlinks which
-#:    would be removed, but will not actually delete any files.
 
 require "cmd/linkapps"
 
@@ -20,11 +13,7 @@ module Homebrew
   module_function
 
   def unlinkapps
-    opoo <<~EOS
-      `brew unlinkapps` has been deprecated and will eventually be removed!
-
-      Unfortunately `brew linkapps` cannot behave nicely with e.g. Spotlight using either aliases or symlinks and Homebrew formulae do not build "proper" `.app` bundles that can be relocated. Instead, please consider using `brew cask` and migrate formulae using `.app`s to casks.
-    EOS
+    odeprecated "'brew unlinkapps'"
 
     target_dir = linkapps_target(local: ARGV.include?("--local"))
 
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 4b03e8080..7832983e3 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -25,13 +25,7 @@ module Homebrew
 
     Homebrew.perform_preinstall_checks
 
-    if ARGV.include?("--all")
-      opoo <<~EOS
-        We decided to not change the behaviour of `brew upgrade` so
-        `brew upgrade --all` is equivalent to `brew upgrade` without any other
-        arguments (so the `--all` is a no-op and can be removed).
-      EOS
-    end
+    odeprecated "'brew upgrade --all'", "'brew upgrade'" if ARGV.include?("--all")
 
     if ARGV.named.empty?
       outdated = Formula.installed.select do |f|