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

Merge pull request #18904 from Homebrew/update-cask-uninstall-trash-messaging

Browse Source 
cask/artifact/abstract_uninstall: handle sudo trashed paths correctly
This commit is contained in:
Mike McQuaid 2024-12-09 09:11:14 +00:00 committed by GitHub
commit ff7b9534f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/artifact/abstract_uninstall.rb
View File

@ -468,9 +468,7 @@ module Cask
trashed = trashed.split(":") trashed = trashed.split(":")
untrashable = untrashable.split(":") untrashable = untrashable.split(":")
return trashed, untrashable if untrashable.empty? trashed_with_permissions, untrashable = untrashable.partition do |path|
untrashable.delete_if do |path|
Utils.gain_permissions(path, ["-R"], SystemCommand) do Utils.gain_permissions(path, ["-R"], SystemCommand) do
system_command! HOMEBREW_LIBRARY_PATH/"cask/utils/trash.swift", system_command! HOMEBREW_LIBRARY_PATH/"cask/utils/trash.swift",
args: [path], args: [path],
@ -482,6 +480,10 @@ module Cask
false false
end end
trashed += trashed_with_permissions
return trashed, untrashable if untrashable.empty?
opoo "The following files could not be trashed, please do so manually:" opoo "The following files could not be trashed, please do so manually:"
$stderr.puts untrashable $stderr.puts untrashable