From e44ac800c2afedc96087eedc5277ff1087c0cded Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Fri, 10 Sep 2021 23:11:41 +0900 Subject: [PATCH] repair cask install quiet mode --- Library/Homebrew/cask/cmd/install.rb | 4 +++- Library/Homebrew/cask/installer.rb | 10 +++++++--- Library/Homebrew/cmd/install.rb | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cask/cmd/install.rb b/Library/Homebrew/cask/cmd/install.rb index 0e3b740e3b..428e58024a 100644 --- a/Library/Homebrew/cask/cmd/install.rb +++ b/Library/Homebrew/cask/cmd/install.rb @@ -38,6 +38,7 @@ module Cask skip_cask_deps: args.skip_cask_deps?, require_sha: args.require_sha?, quarantine: args.quarantine?, + quiet: args.quiet?, ) end @@ -48,7 +49,8 @@ module Cask binaries: nil, skip_cask_deps: nil, require_sha: nil, - quarantine: nil + quarantine: nil, + quiet: nil ) odie "Installing casks is supported only on macOS" unless OS.mac? diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index 863880fd54..0b4558bffe 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -31,7 +31,7 @@ module Cask skip_cask_deps: false, binaries: true, verbose: false, require_sha: false, upgrade: false, installed_as_dependency: false, quarantine: true, - verify_download_integrity: true) + verify_download_integrity: true, quiet: false) @cask = cask @command = command @force = force @@ -44,11 +44,12 @@ module Cask @installed_as_dependency = installed_as_dependency @quarantine = quarantine @verify_download_integrity = verify_download_integrity + @quiet = quiet end attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?, :reinstall?, :upgrade?, :verbose?, :installed_as_dependency?, - :quarantine? + :quarantine?, :quiet? def self.caveats(cask) odebug "Printing caveats" @@ -92,8 +93,11 @@ module Cask odebug "Cask::Installer#install" old_config = @cask.config + if @cask.installed? && !force? && !reinstall? && !upgrade? + return if quiet? - raise CaskAlreadyInstalledError, @cask if @cask.installed? && !force? && !reinstall? && !upgrade? + raise CaskAlreadyInstalledError, @cask + end check_conflicts diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 023c207bf2..dd64ddb615 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -172,6 +172,7 @@ module Homebrew require_sha: args.require_sha?, skip_cask_deps: args.skip_cask_deps?, quarantine: args.quarantine?, + quiet: args.quiet?, ) end