Merge pull request #15296 from apainintheneck/warn-on-cask-install-when-already-installed
cmd/install: warn on cask install when already installed
This commit is contained in:
commit
9acb6cf1e5
@ -197,10 +197,10 @@ module Homebrew
|
|||||||
begin
|
begin
|
||||||
formulae, casks = args.named.to_formulae_and_casks
|
formulae, casks = args.named.to_formulae_and_casks
|
||||||
.partition { |formula_or_cask| formula_or_cask.is_a?(Formula) }
|
.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?)
|
retry if Tap.install_default_cask_tap_if_necessary(force: args.cask?)
|
||||||
|
|
||||||
raise e
|
raise
|
||||||
end
|
end
|
||||||
|
|
||||||
if casks.any?
|
if casks.any?
|
||||||
@ -237,6 +237,8 @@ module Homebrew
|
|||||||
skip_cask_deps: args.skip_cask_deps?,
|
skip_cask_deps: args.skip_cask_deps?,
|
||||||
quarantine: args.quarantine?,
|
quarantine: args.quarantine?,
|
||||||
quiet: args.quiet?).install
|
quiet: args.quiet?).install
|
||||||
|
rescue Cask::CaskAlreadyInstalledError => e
|
||||||
|
opoo e.message
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user