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

Merge pull request #2981 from reitermarkus/fix-trash

Browse Source 
Fix trash script.
This commit is contained in:
Markus Reiter 2017-07-30 19:18:11 +02:00 committed by GitHub
commit ae9d36b2dd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,8 +247,11 @@ module Hbc
set output to "" set output to ""
repeat with i from 1 to (count trashedItems) repeat with i from 1 to (count trashedItems)
set item i of trashedItems 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 & (item i of trashedItems) & (do shell script "printf \"\\0\"") set output to output & trashedItem
if i < count trashedItems then
set output to output & (do shell script "printf \"\\0\"")
end if
end repeat end repeat
return output return output

4
Library/Homebrew/cask/lib/hbc/cli/zap.rb
View File

@ -1,6 +1,8 @@
module Hbc module Hbc
class CLI class CLI
class Zap < AbstractCommand class Zap < AbstractCommand
option "--force", :force, false
def initialize(*) def initialize(*)
super super
raise CaskUnspecifiedError if args.empty? raise CaskUnspecifiedError if args.empty?
@ -13,7 +15,7 @@ module Hbc
def zap_casks def zap_casks
casks.each do |cask| casks.each do |cask|
odebug "Zapping Cask #{cask}" odebug "Zapping Cask #{cask}"
Installer.new(cask, verbose: verbose?).zap Installer.new(cask, verbose: verbose?, force: force?).zap
end end
end end