admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

repair cask install quiet mode

Browse Source
This commit is contained in:
hyuraku 2021-09-10 23:11:41 +09:00
parent 4d07fb9c2e
commit e44ac800c2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/cmd/install.rb
View File

@ -38,6 +38,7 @@ module Cask
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
require_sha: args.require_sha?, require_sha: args.require_sha?,
quarantine: args.quarantine?, quarantine: args.quarantine?,
quiet: args.quiet?,
) )
end end
@ -48,7 +49,8 @@ module Cask
binaries: nil, binaries: nil,
skip_cask_deps: nil, skip_cask_deps: nil,
require_sha: nil, require_sha: nil,
quarantine: nil quarantine: nil,
quiet: nil
) )
odie "Installing casks is supported only on macOS" unless OS.mac? odie "Installing casks is supported only on macOS" unless OS.mac?

10
Library/Homebrew/cask/installer.rb
View File

@ -31,7 +31,7 @@ module Cask
skip_cask_deps: false, binaries: true, verbose: false, skip_cask_deps: false, binaries: true, verbose: false,
require_sha: false, upgrade: false, require_sha: false, upgrade: false,
installed_as_dependency: false, quarantine: true, installed_as_dependency: false, quarantine: true,
verify_download_integrity: true) verify_download_integrity: true, quiet: false)
@cask = cask @cask = cask
@command = command @command = command
@force = force @force = force
@ -44,11 +44,12 @@ module Cask
@installed_as_dependency = installed_as_dependency @installed_as_dependency = installed_as_dependency
@quarantine = quarantine @quarantine = quarantine
@verify_download_integrity = verify_download_integrity @verify_download_integrity = verify_download_integrity
@quiet = quiet
end end
attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?, attr_predicate :binaries?, :force?, :skip_cask_deps?, :require_sha?,
:reinstall?, :upgrade?, :verbose?, :installed_as_dependency?, :reinstall?, :upgrade?, :verbose?, :installed_as_dependency?,
:quarantine? :quarantine?, :quiet?
def self.caveats(cask) def self.caveats(cask)
odebug "Printing caveats" odebug "Printing caveats"
@ -92,8 +93,11 @@ module Cask
odebug "Cask::Installer#install" odebug "Cask::Installer#install"
old_config = @cask.config 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 check_conflicts

1
Library/Homebrew/cmd/install.rb
View File

@ -172,6 +172,7 @@ module Homebrew
require_sha: args.require_sha?, require_sha: args.require_sha?,
skip_cask_deps: args.skip_cask_deps?, skip_cask_deps: args.skip_cask_deps?,
quarantine: args.quarantine?, quarantine: args.quarantine?,
quiet: args.quiet?,
) )
end end