diff --git a/Library/Homebrew/cask/cmd/reinstall.rb b/Library/Homebrew/cask/cmd/reinstall.rb index bf0d0909e89c2f38ef98dd9960b8f8ef90784a97..a0228158f48bed4176063ea785f778b73b2a5065 100644 --- a/Library/Homebrew/cask/cmd/reinstall.rb +++ b/Library/Homebrew/cask/cmd/reinstall.rb @@ -6,31 +6,28 @@ module Cask def run self.class.reinstall_casks( *casks, - binaries: binaries?, - verbose: verbose?, - force: force?, + binaries: binaries?, + verbose: verbose?, + force: force?, skip_cask_deps: skip_cask_deps?, - require_sha: require_sha?, - quarantine: quarantine?, + require_sha: require_sha?, + quarantine: quarantine?, ) end def self.reinstall_casks( *casks, + verbose: false, + force: false, + skip_cask_deps: false, binaries: nil, - verbose: nil, - force: nil, - skip_cask_deps: nil, require_sha: nil, quarantine: nil ) # TODO: Handle this in `CLI::Parser`. - binaries = Homebrew::EnvConfig.cask_opts_binaries? if binaries.nil? - force = Homebrew::EnvConfig.cask_opts_force? if force.nil? - quarantine = Homebrew::EnvConfig.cask_opts_quarantine? if quarantine.nil? - require_sha = Homebrew::EnvConfig.cask_opts_require_sha? if require_sha.nil? - skip_cask_deps = Homebrew::EnvConfig.cask_opts_skip_cask_deps? if skip_cask_deps.nil? - verbose = Homebrew::EnvConfig.cask_opts_verbose? if verbose.nil? + binaries = Homebrew::EnvConfig.cask_opts_binaries? if binaries.nil? + quarantine = Homebrew::EnvConfig.cask_opts_quarantine? if quarantine.nil? + require_sha = Homebrew::EnvConfig.cask_opts_require_sha? if require_sha.nil? casks.each do |cask| Installer.new(cask, diff --git a/Library/Homebrew/cask/cmd/uninstall.rb b/Library/Homebrew/cask/cmd/uninstall.rb index 3f595b9ca42e08be4dd530da7ff2e6da5a6d913f..47d3e42b3613448ba17c9791a45fe1f3bc7d565c 100644 --- a/Library/Homebrew/cask/cmd/uninstall.rb +++ b/Library/Homebrew/cask/cmd/uninstall.rb @@ -14,16 +14,13 @@ module Cask self.class.uninstall_casks( *casks, binaries: binaries?, - verbose: verbose?, - force: force? + verbose: verbose?, + force: force?, ) end - def self.uninstall_casks(*casks, binaries: nil, verbose: nil, force: nil) - # TODO: Handle this in `CLI::Parser`. + def self.uninstall_casks(*casks, verbose: false, force: false, binaries: nil) binaries = Homebrew::EnvConfig.cask_opts_binaries? if binaries.nil? - force = Homebrew::EnvConfig.cask_opts_force? if force.nil? - verbose = Homebrew::EnvConfig.cask_opts_verbose? if verbose.nil? casks.each do |cask| odebug "Uninstalling Cask #{cask}" diff --git a/Library/Homebrew/cask/cmd/upgrade.rb b/Library/Homebrew/cask/cmd/upgrade.rb index c8db6319d2e7f6d18458b823553aa15cec9b6236..f1450d0c992f048198e41cc8ebd8328502aca0a8 100644 --- a/Library/Homebrew/cask/cmd/upgrade.rb +++ b/Library/Homebrew/cask/cmd/upgrade.rb @@ -33,23 +33,19 @@ module Cask def self.upgrade_casks( *casks, - force: nil, - greedy: nil, - dry_run: nil, + force: false, + greedy: false, + dry_run: false, + skip_cask_deps: false, + verbose: false, binaries: nil, - skip_cask_deps: nil, - verbose: nil, quarantine: nil, require_sha: nil ) # TODO: Handle this in `CLI::Parser`. - binaries = Homebrew::EnvConfig.cask_opts_binaries? if binaries.nil? - dry_run = Homebrew::EnvConfig.cask_opts_dry_run? if dry_run.nil? - force = Homebrew::EnvConfig.cask_opts_force? if force.nil? - greedy = Homebrew::EnvConfig.cask_opts_greedy? if greedy.nil? - quarantine = Homebrew::EnvConfig.cask_opts_quarantine? if quarantine.nil? + binaries = Homebrew::EnvConfig.cask_opts_binaries? if binaries.nil? + quarantine = Homebrew::EnvConfig.cask_opts_quarantine? if quarantine.nil? require_sha = Homebrew::EnvConfig.cask_opts_require_sha? if require_sha.nil? - verbose = Homebrew::EnvConfig.cask_opts_verbose? if verbose.nil? outdated_casks = if casks.empty? Caskroom.casks.select do |cask| diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb index 9b636ab4a20ba7a4b727473dac6078fc05d73a1d..15dbc862c486f7185a46e7e9d9f60e9447f597e5 100644 --- a/Library/Homebrew/env_config.rb +++ b/Library/Homebrew/env_config.rb @@ -332,18 +332,6 @@ module Homebrew true end - def cask_opts_dry_run? - cask_opts.include?("--dry-run") - end - - def cask_opts_force? - cask_opts.include?("--force") - end - - def cask_opts_greedy? - cask_opts.include?("--greedy") - end - def cask_opts_quarantine? cask_opts.reverse_each do |opt| return true if opt == "--quarantine" @@ -356,13 +344,5 @@ module Homebrew def cask_opts_require_sha? cask_opts.include?("--require-sha") end - - def cask_opts_skip_cask_deps? - cask_opts.include?("--skip-cask-deps") - end - - def cask_opts_verbose? - cask_opts.include?("--verbose") - end end end