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

remove options and comments

Browse Source
This commit is contained in:
hyuraku 2023-03-11 21:15:24 +09:00
parent 8c1ce514b2
commit e321edabbc
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/uninstall.rb
View File

@ -7,18 +7,12 @@ module Cask
def self.uninstall_casks(*casks, binaries: nil, force: false, verbose: false) def self.uninstall_casks(*casks, binaries: nil, force: false, verbose: false)
require "cask/installer" require "cask/installer"
options = {
binaries: binaries,
force: force,
verbose: verbose,
}.compact
casks.each do |cask| casks.each do |cask|
odebug "Uninstalling Cask #{cask}" odebug "Uninstalling Cask #{cask}"
raise CaskNotInstalledError, cask if !cask.installed? && !force raise CaskNotInstalledError, cask if !cask.installed? && !force
Installer.new(cask, **options).uninstall Installer.new(cask, binaries: binaries, force: force, verbose: verbose).uninstall
next if (versions = cask.versions).empty? next if (versions = cask.versions).empty?

2
Library/Homebrew/test/cask/uninstall_spec.rb
View File

@ -86,7 +86,6 @@ describe Cask::Uninstall, :cask do
] ]
end end
let(:caskroom_path) { Cask::Caskroom.path.join(token).tap(&:mkpath) } let(:caskroom_path) { Cask::Caskroom.path.join(token).tap(&:mkpath) }
# let(:versioned_cask) { Cask::CaskLoader.load(caskroom_path) }
before do before do
timestamped_versions.each do |timestamped_version| timestamped_versions.each do |timestamped_version|
@ -127,7 +126,6 @@ describe Cask::Uninstall, :cask do
context "when Casks in Taps have been renamed or removed" do context "when Casks in Taps have been renamed or removed" do
let(:app) { Cask::Config.new.appdir.join("ive-been-renamed.app") } let(:app) { Cask::Config.new.appdir.join("ive-been-renamed.app") }
let(:caskroom_path) { Cask::Caskroom.path.join("ive-been-renamed").tap(&:mkpath) } let(:caskroom_path) { Cask::Caskroom.path.join("ive-been-renamed").tap(&:mkpath) }
# let(:ive_been_renamed) { Cask::CaskLoader.load(caskroom_path) }
let(:saved_caskfile) do let(:saved_caskfile) do
caskroom_path.join(".metadata", "latest", "timestamp", "Casks").join("ive-been-renamed.rb") caskroom_path.join(".metadata", "latest", "timestamp", "Casks").join("ive-been-renamed.rb")
end end