From e82867a7556bb61efc16623080073648b9bb1e9d Mon Sep 17 00:00:00 2001 From: apainintheneck Date: Sun, 23 Apr 2023 10:22:52 -0700 Subject: [PATCH] cmd/install: warn on cask install when already installed This was the default behavior before #15273 got merged in to refactor the `cask/cmd/install` logic into `cmd/install`. --- Library/Homebrew/cmd/install.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 10c60c31eb..36bf3e2160 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -197,10 +197,10 @@ module Homebrew begin formulae, casks = args.named.to_formulae_and_casks .partition { |formula_or_cask| formula_or_cask.is_a?(Formula) } - rescue FormulaOrCaskUnavailableError, Cask::CaskUnavailableError => e + rescue FormulaOrCaskUnavailableError, Cask::CaskUnavailableError retry if Tap.install_default_cask_tap_if_necessary(force: args.cask?) - raise e + raise end if casks.any? @@ -237,6 +237,8 @@ module Homebrew skip_cask_deps: args.skip_cask_deps?, quarantine: args.quarantine?, quiet: args.quiet?).install + rescue Cask::CaskAlreadyInstalledError => e + opoo e.message end end