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

Remove invalid HOMEBREW_CASK_OPTS options

Browse Source
This commit is contained in:
William Ma 2020-08-05 12:12:50 -04:00
parent 907d4d7f74
commit 72b0859b8c
4 changed files with 21 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/cask/cmd/reinstall.rb
View File

@ -17,20 +17,17 @@ module Cask
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?
casks.each do |cask|
Installer.new(cask,

7
Library/Homebrew/cask/cmd/uninstall.rb
View File

@ -15,15 +15,12 @@ module Cask
*casks,
binaries: binaries?,
verbose: verbose?,
force: force?
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}"

14
Library/Homebrew/cask/cmd/upgrade.rb
View File

@ -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?
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|

20
Library/Homebrew/env_config.rb
View File

@ -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