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

Fix brew tests leaving last file in trash.

Browse Source
This commit is contained in:
Markus Reiter 2017-10-01 01:47:08 +02:00
parent 55dd44efad
commit 965ca01596
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/cask/lib/hbc/artifact/abstract_uninstall.rb
View File

@ -253,7 +253,7 @@ module Hbc
end end
def trash_paths(*paths, command: nil, **_) def trash_paths(*paths, command: nil, **_)
command.run!("/usr/bin/osascript", args: ["-e", <<-'EOS'.undent, *paths]) result = command.run!("/usr/bin/osascript", args: ["-e", <<-'EOS'.undent, *paths])
on run argv on run argv
repeat with i from 1 to (count argv) repeat with i from 1 to (count argv)
set item i of argv to (item i of argv as POSIX file) set item i of argv to (item i of argv as POSIX file)
@ -267,7 +267,7 @@ module Hbc
set trashedItem to POSIX path of (item i of trashedItems as string) set trashedItem to POSIX path of (item i of trashedItems as string)
set output to output & trashedItem set output to output & trashedItem
if i < count trashedItems then if i < count trashedItems then
set output to output & (do shell script "printf \"\\0\"") set output to output & character id 0
end if end if
end repeat end repeat
@ -275,6 +275,9 @@ module Hbc
end tell end tell
end run end run
EOS EOS
# Remove AppleScript's automatic newline.
result.tap { |r| r.stdout.sub!(/\n$/, "") }
end end
def uninstall_rmdir(*directories, command: nil, **_) def uninstall_rmdir(*directories, command: nil, **_)