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

Merge pull request #10934 from dawidd6/revert-uninstall

Browse Source 
Revert "Fix `uninstall --force` for casks."
This commit is contained in:
Dawid Dziurla 2021-03-25 19:10:08 +01:00 committed by GitHub
commit 5b1ad84184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cli/named_args.rb
View File

@ -91,8 +91,8 @@ module Homebrew
when :keg when :keg
resolve_keg(name) resolve_keg(name)
when :kegs when :kegs
_, kegs = resolve_kegs(name) rack = Formulary.to_rack(name)
kegs rack.directory? ? rack.subdirs.map { |d| Keg.new(d) } : []
else else
raise raise
end end
@ -259,21 +259,15 @@ module Homebrew
end end
private :spec private :spec
def resolve_kegs(name) def resolve_keg(name)
raise UsageError if name.blank? raise UsageError if name.blank?
require "keg" require "keg"
rack = Formulary.to_rack(name.downcase) rack = Formulary.to_rack(name.downcase)
kegs = rack.directory? ? rack.subdirs.map { |d| Keg.new(d) } : [] dirs = rack.directory? ? rack.subdirs : []
raise NoSuchKegError, rack.basename if kegs.none? raise NoSuchKegError, rack.basename if dirs.empty?
[rack, kegs]
end
def resolve_keg(name)
rack, kegs = resolve_kegs(name)
linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename linked_keg_ref = HOMEBREW_LINKED_KEGS/rack.basename
opt_prefix = HOMEBREW_PREFIX/"opt/#{rack.basename}" opt_prefix = HOMEBREW_PREFIX/"opt/#{rack.basename}"
@ -281,7 +275,7 @@ module Homebrew
begin begin
return Keg.new(opt_prefix.resolved_path) if opt_prefix.symlink? && opt_prefix.directory? return Keg.new(opt_prefix.resolved_path) if opt_prefix.symlink? && opt_prefix.directory?
return Keg.new(linked_keg_ref.resolved_path) if linked_keg_ref.symlink? && linked_keg_ref.directory? return Keg.new(linked_keg_ref.resolved_path) if linked_keg_ref.symlink? && linked_keg_ref.directory?
return kegs.first if kegs.length == 1 return Keg.new(dirs.first) if dirs.length == 1
f = if name.include?("/") || File.exist?(name) f = if name.include?("/") || File.exist?(name)
Formulary.factory(name) Formulary.factory(name)