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

uninstall: Refactor when using --force

Browse Source
This commit is contained in:
William Ma 2020-07-02 15:28:41 -04:00
parent 3459931a8d
commit eb1ea006f2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/cmd/uninstall.rb
View File

@ -34,20 +34,21 @@ module Homebrew
if args.force? if args.force?
casks = [] casks = []
kegs_by_rack = Hash[args.named.map do |name| kegs_by_rack = Hash.new
args.named.each do |name|
rack = Formulary.to_rack(name) rack = Formulary.to_rack(name)
unless rack.directory? if rack.directory?
kegs_by_rack[rack] = rack.subdirs.map { |d| Keg.new(d) }
else
begin begin
casks << Cask::CaskLoader.load(name) casks << Cask::CaskLoader.load(name)
rescue Cask::CaskUnavailableError rescue Cask::CaskUnavailableError
# Since the uninstall was forced, ignore any unavailable casks # Since the uninstall was forced, ignore any unavailable casks
end end
next
end end
end
[rack, rack.subdirs.map { |d| Keg.new(d) }]
end]
else else
all_kegs, casks = args.kegs_casks all_kegs, casks = args.kegs_casks
kegs_by_rack = all_kegs.group_by(&:rack) kegs_by_rack = all_kegs.group_by(&:rack)