Remove --adopt switch from reinstall and upgrade
This commit is contained in:
parent
9256a01afe
commit
a0f915169c
@ -16,7 +16,6 @@ module Cask
|
||||
binaries: args.binaries?,
|
||||
verbose: args.verbose?,
|
||||
force: args.force?,
|
||||
adopt: args.adopt?,
|
||||
skip_cask_deps: args.skip_cask_deps?,
|
||||
require_sha: args.require_sha?,
|
||||
quarantine: args.quarantine?,
|
||||
@ -28,7 +27,6 @@ module Cask
|
||||
*casks,
|
||||
verbose: nil,
|
||||
force: nil,
|
||||
adopt: nil,
|
||||
skip_cask_deps: nil,
|
||||
binaries: nil,
|
||||
require_sha: nil,
|
||||
@ -41,7 +39,6 @@ module Cask
|
||||
binaries: binaries,
|
||||
verbose: verbose,
|
||||
force: force,
|
||||
adopt: adopt,
|
||||
skip_cask_deps: skip_cask_deps,
|
||||
require_sha: require_sha,
|
||||
quarantine: quarantine,
|
||||
|
||||
@ -13,10 +13,6 @@ module Cask
|
||||
extend T::Sig
|
||||
|
||||
OPTIONS = [
|
||||
[:switch, "--adopt", {
|
||||
description: "Adopt existing artifacts in the destination that are identical to those being installed. " \
|
||||
"Cannot be combined with --force.",
|
||||
}],
|
||||
[:switch, "--skip-cask-deps", {
|
||||
description: "Skip installing cask dependencies.",
|
||||
}],
|
||||
@ -70,7 +66,6 @@ module Cask
|
||||
casks: Cask,
|
||||
args: Homebrew::CLI::Args,
|
||||
force: T.nilable(T::Boolean),
|
||||
adopt: T.nilable(T::Boolean),
|
||||
greedy: T.nilable(T::Boolean),
|
||||
greedy_latest: T.nilable(T::Boolean),
|
||||
greedy_auto_updates: T.nilable(T::Boolean),
|
||||
@ -86,7 +81,6 @@ module Cask
|
||||
*casks,
|
||||
args:,
|
||||
force: false,
|
||||
adopt: false,
|
||||
greedy: false,
|
||||
greedy_latest: false,
|
||||
greedy_auto_updates: false,
|
||||
@ -162,7 +156,7 @@ module Cask
|
||||
upgradable_casks.each do |(old_cask, new_cask)|
|
||||
upgrade_cask(
|
||||
old_cask, new_cask,
|
||||
binaries: binaries, force: force, adopt: adopt, skip_cask_deps: skip_cask_deps, verbose: verbose,
|
||||
binaries: binaries, force: force, skip_cask_deps: skip_cask_deps, verbose: verbose,
|
||||
quarantine: quarantine, require_sha: require_sha
|
||||
)
|
||||
rescue => e
|
||||
@ -177,7 +171,7 @@ module Cask
|
||||
|
||||
def self.upgrade_cask(
|
||||
old_cask, new_cask,
|
||||
binaries:, force:, adopt:, quarantine:, require_sha:, skip_cask_deps:, verbose:
|
||||
binaries:, force:, quarantine:, require_sha:, skip_cask_deps:, verbose:
|
||||
)
|
||||
require "cask/installer"
|
||||
|
||||
@ -201,7 +195,6 @@ module Cask
|
||||
binaries: binaries,
|
||||
verbose: verbose,
|
||||
force: force,
|
||||
adopt: adopt,
|
||||
skip_cask_deps: skip_cask_deps,
|
||||
require_sha: require_sha,
|
||||
upgrade: true,
|
||||
|
||||
@ -152,7 +152,6 @@ module Homebrew
|
||||
binaries: args.binaries?,
|
||||
verbose: args.verbose?,
|
||||
force: args.force?,
|
||||
adopt: args.adopt?,
|
||||
require_sha: args.require_sha?,
|
||||
skip_cask_deps: args.skip_cask_deps?,
|
||||
quarantine: args.quarantine?,
|
||||
|
||||
@ -97,7 +97,6 @@ module Homebrew
|
||||
cask_options
|
||||
|
||||
conflicts "--build-from-source", "--force-bottle"
|
||||
conflicts "--adopt", "--force"
|
||||
|
||||
named_args [:outdated_formula, :outdated_cask]
|
||||
end
|
||||
@ -227,7 +226,6 @@ module Homebrew
|
||||
Cask::Cmd::Upgrade.upgrade_casks(
|
||||
*casks,
|
||||
force: args.force?,
|
||||
adopt: args.adopt?,
|
||||
greedy: args.greedy?,
|
||||
greedy_latest: args.greedy_latest?,
|
||||
greedy_auto_updates: args.greedy_auto_updates?,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user