From 6f0056ad9dcdd243c0f1b1149e50e059dec2b343 Mon Sep 17 00:00:00 2001 From: commitay Date: Sat, 18 Nov 2017 19:50:50 +1000 Subject: [PATCH] Convert to zap trash: D (#40985) --- Casks/daisydisk.rb | 10 +++++----- Casks/darwindumper.rb | 12 ++++++------ Casks/dat.rb | 22 ++++++++++------------ Casks/datadog-agent.rb | 2 +- Casks/daylite.rb | 16 ++++++++-------- Casks/debookee.rb | 14 +++++++------- Casks/deezer.rb | 8 ++++---- Casks/default-folder-x.rb | 14 +++++++------- Casks/deltawalker.rb | 12 ++++++------ Casks/deploymate.rb | 10 +++++----- Casks/detectx.rb | 10 +++++----- Casks/devdocs.rb | 12 ++++++------ Casks/devrantron.rb | 12 ++++++------ Casks/diffmerge.rb | 10 +++++----- Casks/discord.rb | 20 +++++++++----------- Casks/disk-drill.rb | 10 +++++----- Casks/disk-sensei.rb | 18 ++++++++---------- Casks/displaycal.rb | 10 +++++----- Casks/divvy.rb | 8 ++++---- Casks/dnscrypt.rb | 6 ++++-- Casks/docker.rb | 28 ++++++++++++++-------------- Casks/dockstation.rb | 14 ++++++-------- Casks/dogecoin.rb | 2 +- Casks/dolphin.rb | 8 ++++---- Casks/domainbrain.rb | 10 +++++----- Casks/doubletwist.rb | 10 +++++----- Casks/dragand.rb | 10 +++++----- Casks/drawio.rb | 10 +++++----- Casks/dripcap.rb | 14 +++++++------- Casks/dropdmg.rb | 14 +++++++------- Casks/dropshare.rb | 14 +++++++------- Casks/dusty.rb | 2 +- 32 files changed, 183 insertions(+), 189 deletions(-) diff --git a/Casks/daisydisk.rb b/Casks/daisydisk.rb index 3b3e7dc1493..bcbbb9010e1 100644 --- a/Casks/daisydisk.rb +++ b/Casks/daisydisk.rb @@ -23,9 +23,9 @@ cask 'daisydisk' do uninstall delete: '/Library/PrivilegedHelperTools/com.daisydiskapp.DaisyDiskAdminHelper', launchctl: 'com.daisydiskapp.DaisyDiskAdminHelper' - zap delete: '~/Library/Caches/com.daisydiskapp.DaisyDiskStandAlone', - trash: [ - '~/Library/Application Support/DaisyDisk', - '~/Library/Preferences/com.daisydiskapp.DaisyDiskStandAlone.plist', - ] + zap trash: [ + '~/Library/Application Support/DaisyDisk', + '~/Library/Caches/com.daisydiskapp.DaisyDiskStandAlone', + '~/Library/Preferences/com.daisydiskapp.DaisyDiskStandAlone.plist', + ] end diff --git a/Casks/darwindumper.rb b/Casks/darwindumper.rb index c7e970d7471..95c82d408e0 100644 --- a/Casks/darwindumper.rb +++ b/Casks/darwindumper.rb @@ -10,10 +10,10 @@ cask 'darwindumper' do app 'DarwinDumper.app' - zap delete: [ - '~/Library/Caches/com.DarwinDumper', - '~/Library/Preferences/com.DarwinDumper.plist', - '~/Library/Preferences/org.tom.DarwinDumper.plist', - '~/Library/Saved Application State/com.DarwinDumper.savedState', - ] + zap trash: [ + '~/Library/Caches/com.DarwinDumper', + '~/Library/Preferences/com.DarwinDumper.plist', + '~/Library/Preferences/org.tom.DarwinDumper.plist', + '~/Library/Saved Application State/com.DarwinDumper.savedState', + ] end diff --git a/Casks/dat.rb b/Casks/dat.rb index 8bbd59b8bad..f15026a2c05 100644 --- a/Casks/dat.rb +++ b/Casks/dat.rb @@ -11,16 +11,14 @@ cask 'dat' do app 'Dat.app' - zap delete: [ - '~/Library/Caches/com.datproject.dat', - '~/Library/Caches/com.datproject.dat.ShipIt', - '~/Library/Saved Application State/com.datproject.dat.savedState', - ], - trash: [ - '~/Library/Application Support/Dat', - '~/Library/Preferences/com.datproject.dat.helper.plist', - '~/Library/Preferences/com.datproject.dat.plist', - '~/.dat', - '~/.dat-desktop', - ] + zap trash: [ + '~/Library/Application Support/Dat', + '~/Library/Caches/com.datproject.dat', + '~/Library/Caches/com.datproject.dat.ShipIt', + '~/Library/Preferences/com.datproject.dat.helper.plist', + '~/Library/Preferences/com.datproject.dat.plist', + '~/Library/Saved Application State/com.datproject.dat.savedState', + '~/.dat', + '~/.dat-desktop', + ] end diff --git a/Casks/datadog-agent.rb b/Casks/datadog-agent.rb index 78bcc63bd4e..9db9cc24d40 100644 --- a/Casks/datadog-agent.rb +++ b/Casks/datadog-agent.rb @@ -16,7 +16,7 @@ cask 'datadog-agent' do uninstall pkgutil: 'com.datadoghq.agent' - zap delete: '/opt/datadog-agent' + zap trash: '/opt/datadog-agent' caveats <<~EOS You will need to update /opt/datadog-agent/etc/datadog.conf and replace APIKEY with your api key diff --git a/Casks/daylite.rb b/Casks/daylite.rb index b3e13937a56..7fa7824b07a 100644 --- a/Casks/daylite.rb +++ b/Casks/daylite.rb @@ -22,12 +22,12 @@ cask 'daylite' do ['KILL', '*.com.marketcircle.Daylite-Helper'], ] - zap delete: [ - '~/Library/Application Support/com.marketcircle.daylite', - '~/Library/Caches/com.marketcircle.daylite', - '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.marketcircle.daylite', - '~/Library/Group Containers/*.com.marketcircle.daylite', - '~/Library/Preferences/com.marketcircle.daylite.plist', - '~/Library/Saved Application State/com.marketcircle.daylite.savedState', - ] + zap trash: [ + '~/Library/Application Support/com.marketcircle.daylite', + '~/Library/Caches/com.marketcircle.daylite', + '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.marketcircle.daylite', + '~/Library/Group Containers/*.com.marketcircle.daylite', + '~/Library/Preferences/com.marketcircle.daylite.plist', + '~/Library/Saved Application State/com.marketcircle.daylite.savedState', + ] end diff --git a/Casks/debookee.rb b/Casks/debookee.rb index 0a87ad52ea8..149e0129afc 100644 --- a/Casks/debookee.rb +++ b/Casks/debookee.rb @@ -14,11 +14,11 @@ cask 'debookee' do uninstall delete: '/Library/PrivilegedHelperTools/com.iwaxx.Debookee.PacketTool', launchctl: 'com.iwaxx.Debookee.PacketTool' - zap delete: [ - '~/Library/Caches/com.iwaxx.Debookee', - '~/Library/Cookies/com.iwaxx.Debookee.binarycookies', - '~/Library/Saved Application State/com.iwaxx.Debookee.savedState', - '~/Library/WebKit/com.iwaxx.Debookee', - ], - trash: '~/Library/Preferences/com.iwaxx.Debookee.plist' + zap trash: [ + '~/Library/Caches/com.iwaxx.Debookee', + '~/Library/Cookies/com.iwaxx.Debookee.binarycookies', + '~/Library/Preferences/com.iwaxx.Debookee.plist', + '~/Library/Saved Application State/com.iwaxx.Debookee.savedState', + '~/Library/WebKit/com.iwaxx.Debookee', + ] end diff --git a/Casks/deezer.rb b/Casks/deezer.rb index ce517afda82..9d14978a430 100644 --- a/Casks/deezer.rb +++ b/Casks/deezer.rb @@ -8,8 +8,8 @@ cask 'deezer' do app 'Deezer.app' - zap delete: [ - '~/Library/Application Support/Deezer', - '~/Library/Preferences/com.deezer.Deezer.plist', - ] + zap trash: [ + '~/Library/Application Support/Deezer', + '~/Library/Preferences/com.deezer.Deezer.plist', + ] end diff --git a/Casks/default-folder-x.rb b/Casks/default-folder-x.rb index 6422643b54e..b14b74bf918 100644 --- a/Casks/default-folder-x.rb +++ b/Casks/default-folder-x.rb @@ -8,11 +8,11 @@ cask 'default-folder-x' do app 'Default Folder X.app' - zap delete: [ - '~/Library/Application Support/.com.stclairsoft', - '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.stclairsoft.defaultfolderx5.sfl*', - '~/Library/Application Support/com.stclairsoft.DefaultFolderX5', - '~/Library/Caches/com.stclairsoft.DefaultFolderX5', - '~/Library/Preferences/com.stclairsoft.DefaultFolderX5.plist', - ] + zap trash: [ + '~/Library/Application Support/.com.stclairsoft', + '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.stclairsoft.defaultfolderx5.sfl*', + '~/Library/Application Support/com.stclairsoft.DefaultFolderX5', + '~/Library/Caches/com.stclairsoft.DefaultFolderX5', + '~/Library/Preferences/com.stclairsoft.DefaultFolderX5.plist', + ] end diff --git a/Casks/deltawalker.rb b/Casks/deltawalker.rb index 7bd6b745694..7ce402f0e5d 100644 --- a/Casks/deltawalker.rb +++ b/Casks/deltawalker.rb @@ -11,10 +11,10 @@ cask 'deltawalker' do app 'DeltaWalker.app' - zap delete: [ - '~/Library/Caches/com.deltopia.DeltaWalker', - '~/Library/Containers/com.deltopia.DeltaWalker', - '~/Library/Preferences/com.deltopia.DeltaWalker.plist', - '~/Library/Saved Application State/com.deltopia.DeltaWalker.savedState', - ] + zap trash: [ + '~/Library/Caches/com.deltopia.DeltaWalker', + '~/Library/Containers/com.deltopia.DeltaWalker', + '~/Library/Preferences/com.deltopia.DeltaWalker.plist', + '~/Library/Saved Application State/com.deltopia.DeltaWalker.savedState', + ] end diff --git a/Casks/deploymate.rb b/Casks/deploymate.rb index 54829cda350..2d123ef9a38 100644 --- a/Casks/deploymate.rb +++ b/Casks/deploymate.rb @@ -11,9 +11,9 @@ cask 'deploymate' do app 'Deploymate.app' - zap delete: [ - '~/Library/Caches/com.ivanvasic.deploymate', - '~/Library/Preferences/com.ivanvasic.deploymate.plist', - '~/Library/Preferences/com.ivanvasic.deploymate.LSSharedFileList.plist', - ] + zap trash: [ + '~/Library/Caches/com.ivanvasic.deploymate', + '~/Library/Preferences/com.ivanvasic.deploymate.plist', + '~/Library/Preferences/com.ivanvasic.deploymate.LSSharedFileList.plist', + ] end diff --git a/Casks/detectx.rb b/Casks/detectx.rb index 9b753c46440..77f91628587 100644 --- a/Casks/detectx.rb +++ b/Casks/detectx.rb @@ -13,9 +13,9 @@ cask 'detectx' do app 'DetectX.app' - zap delete: [ - '~/Library/Application Support/com.sqwarq.DetectX', - '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.sqwarq.detectx.sfl*', - '~/Library/Preferences/com.sqwarq.DetectX.plist', - ] + zap trash: [ + '~/Library/Application Support/com.sqwarq.DetectX', + '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.sqwarq.detectx.sfl*', + '~/Library/Preferences/com.sqwarq.DetectX.plist', + ] end diff --git a/Casks/devdocs.rb b/Casks/devdocs.rb index 5e31dff0e4a..537053c8f00 100644 --- a/Casks/devdocs.rb +++ b/Casks/devdocs.rb @@ -10,10 +10,10 @@ cask 'devdocs' do app 'DevDocs.app' - zap delete: [ - '~/Library/Application Support/DevDocs', - '~/Library/Preferences/com.egoistian.devdocs-app.helper.plist', - '~/Library/Preferences/com.egoistian.devdocs-app.plist', - '~/Library/Saved Application State/com.egoistian.devdocs-app.savedState', - ] + zap trash: [ + '~/Library/Application Support/DevDocs', + '~/Library/Preferences/com.egoistian.devdocs-app.helper.plist', + '~/Library/Preferences/com.egoistian.devdocs-app.plist', + '~/Library/Saved Application State/com.egoistian.devdocs-app.savedState', + ] end diff --git a/Casks/devrantron.rb b/Casks/devrantron.rb index e6686b7e13f..99865bb07b3 100644 --- a/Casks/devrantron.rb +++ b/Casks/devrantron.rb @@ -17,10 +17,10 @@ cask 'devrantron' do ['TERM', 'de.zerotask.theclassic.helper'], ] - zap delete: '~/Library/Saved Application State/de.zerotask.theclassic.savedState', - trash: [ - '~/Library/Application Support/devrantron', - '~/Library/Preferences/de.zerotask.theclassic.helper.plist', - '~/Library/Preferences/de.zerotask.theclassic.plist', - ] + zap trash: [ + '~/Library/Application Support/devrantron', + '~/Library/Preferences/de.zerotask.theclassic.helper.plist', + '~/Library/Preferences/de.zerotask.theclassic.plist', + '~/Library/Saved Application State/de.zerotask.theclassic.savedState', + ] end diff --git a/Casks/diffmerge.rb b/Casks/diffmerge.rb index adbd2437296..b36f98686e0 100644 --- a/Casks/diffmerge.rb +++ b/Casks/diffmerge.rb @@ -10,9 +10,9 @@ cask 'diffmerge' do uninstall pkgutil: 'com.sourcegear.DiffMerge' - zap delete: [ - '~/Library/Preferences/com.sourcegear.DiffMerge.plist', - '~/Library/Preferences/SourceGear DiffMerge Preferences', - '~/Library/Saved Application State/com.sourcegear.DiffMerge.savedState', - ] + zap trash: [ + '~/Library/Preferences/com.sourcegear.DiffMerge.plist', + '~/Library/Preferences/SourceGear DiffMerge Preferences', + '~/Library/Saved Application State/com.sourcegear.DiffMerge.savedState', + ] end diff --git a/Casks/discord.rb b/Casks/discord.rb index bf65dfbda3e..f0c33448df2 100644 --- a/Casks/discord.rb +++ b/Casks/discord.rb @@ -10,15 +10,13 @@ cask 'discord' do app 'Discord.app' - zap delete: [ - '~/Library/Caches/com.hnc.Discord', - '~/Library/Caches/com.hnc.Discord.ShipIt', - '~/Library/Cookies/com.hnc.Discord.binarycookies', - '~/Library/Saved Application State/com.hnc.Discord.savedState', - ], - trash: [ - '~/Library/Application Support/discord', - '~/Library/Preferences/com.hnc.Discord.helper.plist', - '~/Library/Preferences/com.hnc.Discord.plist', - ] + zap trash: [ + '~/Library/Application Support/discord', + '~/Library/Caches/com.hnc.Discord', + '~/Library/Caches/com.hnc.Discord.ShipIt', + '~/Library/Cookies/com.hnc.Discord.binarycookies', + '~/Library/Preferences/com.hnc.Discord.helper.plist', + '~/Library/Preferences/com.hnc.Discord.plist', + '~/Library/Saved Application State/com.hnc.Discord.savedState', + ] end diff --git a/Casks/disk-drill.rb b/Casks/disk-drill.rb index 10fa9123988..a318816e378 100644 --- a/Casks/disk-drill.rb +++ b/Casks/disk-drill.rb @@ -12,9 +12,9 @@ cask 'disk-drill' do uninstall delete: '/Library/Application Support/CleverFiles' - zap delete: [ - '~/Library/Application Support/DiskDrill', - '~/Library/Caches/com.cleverfiles.Disk_Drill', - '~/Library/Logs/DiskDrill.log', - ] + zap trash: [ + '~/Library/Application Support/DiskDrill', + '~/Library/Caches/com.cleverfiles.Disk_Drill', + '~/Library/Logs/DiskDrill.log', + ] end diff --git a/Casks/disk-sensei.rb b/Casks/disk-sensei.rb index 7e70a782647..e8fa0d90b8f 100644 --- a/Casks/disk-sensei.rb +++ b/Casks/disk-sensei.rb @@ -16,14 +16,12 @@ cask 'disk-sensei' do uninstall delete: '/Library/PrivilegedHelperTools/org.cindori.SenseiTool', launchctl: 'org.cindori.SenseiTool' - zap delete: [ - '~/Library/Caches/org.cindori.Disk-Sensei', - '~/Library/Cookies/org.cindori.Disk-Sensei.binarycookies', - '~/Library/Saved Application State/org.cindori.Disk-Sensei.savedState', - ], - trash: [ - '~/Library/Application Support/Disk Sensei', - '~/Library/Application Support/org.cindori.Disk-Sensei', - '~/Library/Preferences/org.cindori.Disk-Sensei.plist', - ] + zap trash: [ + '~/Library/Application Support/Disk Sensei', + '~/Library/Application Support/org.cindori.Disk-Sensei', + '~/Library/Caches/org.cindori.Disk-Sensei', + '~/Library/Cookies/org.cindori.Disk-Sensei.binarycookies', + '~/Library/Preferences/org.cindori.Disk-Sensei.plist', + '~/Library/Saved Application State/org.cindori.Disk-Sensei.savedState', + ] end diff --git a/Casks/displaycal.rb b/Casks/displaycal.rb index 9ef6ccc3d7c..5869b1fd5a9 100644 --- a/Casks/displaycal.rb +++ b/Casks/displaycal.rb @@ -18,9 +18,9 @@ cask 'displaycal' do FileUtils.mv(staged_path.children, staged_path.join('DisplayCAL').tap(&:mkpath)) end - zap delete: [ - '~/Library/Application Support/dispcalGUI', - '~/Library/Logs/dispcalGUI', - '~/Library/Preferences/dispcalGUI', - ] + zap trash: [ + '~/Library/Application Support/dispcalGUI', + '~/Library/Logs/dispcalGUI', + '~/Library/Preferences/dispcalGUI', + ] end diff --git a/Casks/divvy.rb b/Casks/divvy.rb index 23dfa5209e4..546f4bf4c1e 100644 --- a/Casks/divvy.rb +++ b/Casks/divvy.rb @@ -10,8 +10,8 @@ cask 'divvy' do app 'Divvy.app' - zap delete: [ - '~/Library/Preferences/com.mizage.direct.Divvy.plist', - '~/Library/Preferences/com.mizage.Divvy.plist', - ] + zap trash: [ + '~/Library/Preferences/com.mizage.direct.Divvy.plist', + '~/Library/Preferences/com.mizage.Divvy.plist', + ] end diff --git a/Casks/dnscrypt.rb b/Casks/dnscrypt.rb index c2fd48f2967..cd9b3eb58df 100644 --- a/Casks/dnscrypt.rb +++ b/Casks/dnscrypt.rb @@ -20,6 +20,8 @@ cask 'dnscrypt' do ], delete: '/Library/PreferencePanes/DNSCrypt.prefPane' - zap delete: '/Library/Application Support/DNSCrypt', - trash: '/usr/local/etc/dnscrypt-proxy.conf' + zap trash: [ + '/Library/Application Support/DNSCrypt', + '/usr/local/etc/dnscrypt-proxy.conf', + ] end diff --git a/Casks/docker.rb b/Casks/docker.rb index d1cde984905..ce1a54e512c 100644 --- a/Casks/docker.rb +++ b/Casks/docker.rb @@ -21,18 +21,18 @@ cask 'docker' do ], quit: 'com.docker.docker' - zap delete: [ - '~/Library/Application Scripts/com.docker.helper', - '~/Library/Caches/KSCrashReports/Docker', - '~/Library/Caches/com.docker.docker', - '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.docker.docker', - '~/Library/Containers/com.docker.docker', - '~/Library/Containers/com.docker.helper', - '~/Library/Group Containers/group.com.docker', - ], - trash: '~/Library/Preferences/com.docker.docker.plist', - rmdir: [ - '~/Library/Caches/KSCrashReports', - '~/Library/Caches/com.plausiblelabs.crashreporter.data', - ] + zap trash: [ + '~/Library/Application Scripts/com.docker.helper', + '~/Library/Caches/KSCrashReports/Docker', + '~/Library/Caches/com.docker.docker', + '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.docker.docker', + '~/Library/Containers/com.docker.docker', + '~/Library/Containers/com.docker.helper', + '~/Library/Group Containers/group.com.docker', + '~/Library/Preferences/com.docker.docker.plist', + ], + rmdir: [ + '~/Library/Caches/KSCrashReports', + '~/Library/Caches/com.plausiblelabs.crashreporter.data', + ] end diff --git a/Casks/dockstation.rb b/Casks/dockstation.rb index 2da560ca475..77dbc5775bf 100644 --- a/Casks/dockstation.rb +++ b/Casks/dockstation.rb @@ -13,12 +13,10 @@ cask 'dockstation' do app 'DockStation.app' - zap delete: [ - '~/Library/Saved Application State/org.dockstation.DockStation.savedState', - ], - trash: [ - '~/Library/Application Support/dockstation', - '~/Library/Preferences/org.dockstation.DockStation.helper.plist', - '~/Library/Preferences/org.dockstation.DockStation.plist', - ] + zap trash: [ + '~/Library/Application Support/dockstation', + '~/Library/Preferences/org.dockstation.DockStation.helper.plist', + '~/Library/Preferences/org.dockstation.DockStation.plist', + '~/Library/Saved Application State/org.dockstation.DockStation.savedState', + ] end diff --git a/Casks/dogecoin.rb b/Casks/dogecoin.rb index cf114630f98..1d71e6d201a 100644 --- a/Casks/dogecoin.rb +++ b/Casks/dogecoin.rb @@ -15,5 +15,5 @@ cask 'dogecoin' do set_permissions "#{staged_path}/Dogecoin-Qt.app", '0755' end - zap delete: '~/Library/com.dogecoin.Dogecoin-Qt.plist' + zap trash: '~/Library/com.dogecoin.Dogecoin-Qt.plist' end diff --git a/Casks/dolphin.rb b/Casks/dolphin.rb index 37ab2f78de5..9fc853ab47e 100644 --- a/Casks/dolphin.rb +++ b/Casks/dolphin.rb @@ -10,8 +10,8 @@ cask 'dolphin' do app 'Dolphin.app' - zap delete: [ - '~/Library/Application Support/Dolphin', - '~/Library/Preferences/org.dolphin-emu.dolphin.plist', - ] + zap trash: [ + '~/Library/Application Support/Dolphin', + '~/Library/Preferences/org.dolphin-emu.dolphin.plist', + ] end diff --git a/Casks/domainbrain.rb b/Casks/domainbrain.rb index ca210794d5c..3a27b9067ff 100644 --- a/Casks/domainbrain.rb +++ b/Casks/domainbrain.rb @@ -13,9 +13,9 @@ cask 'domainbrain' do app 'DomainBrain.app' - zap delete: [ - '~/Library/Application Support/DomainBrain', - '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.onebuttonmouse.domainbrain2.sfl*', - '~/Library/Preferences/com.onebuttonmouse.DomainBrain2.plist', - ] + zap trash: [ + '~/Library/Application Support/DomainBrain', + '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.onebuttonmouse.domainbrain2.sfl*', + '~/Library/Preferences/com.onebuttonmouse.DomainBrain2.plist', + ] end diff --git a/Casks/doubletwist.rb b/Casks/doubletwist.rb index 0da8dfac292..c5eb5b59d16 100644 --- a/Casks/doubletwist.rb +++ b/Casks/doubletwist.rb @@ -10,9 +10,9 @@ cask 'doubletwist' do app 'doubleTwist.app' - zap delete: [ - '~/Library/Application Support/doubleTwist', - '~/Library/Preferences/com.doubleTwist.desktop.plist', - '~/Library/Caches/com.doubleTwist.desktop', - ] + zap trash: [ + '~/Library/Application Support/doubleTwist', + '~/Library/Preferences/com.doubleTwist.desktop.plist', + '~/Library/Caches/com.doubleTwist.desktop', + ] end diff --git a/Casks/dragand.rb b/Casks/dragand.rb index 55a5ba3b78d..1dccb1d2753 100644 --- a/Casks/dragand.rb +++ b/Casks/dragand.rb @@ -8,9 +8,9 @@ cask 'dragand' do app 'Dragand.app' - zap delete: '~/Library/Preferences/com.node-webkit-builder.dragand.plist', - trash: [ - '~/Library/Application Support/Dragand', - '~/Library/Saved Application State/com.node-webkit-builder.dragand.savedState', - ] + zap trash: [ + '~/Library/Application Support/Dragand', + '~/Library/Preferences/com.node-webkit-builder.dragand.plist', + '~/Library/Saved Application State/com.node-webkit-builder.dragand.savedState', + ] end diff --git a/Casks/drawio.rb b/Casks/drawio.rb index 2c6ea54513c..2d4f339db8d 100644 --- a/Casks/drawio.rb +++ b/Casks/drawio.rb @@ -11,9 +11,9 @@ cask 'drawio' do app 'draw.io.app' - zap delete: '~/Library/Saved Application State/com.jgraph.drawio.desktop.savedState', - trash: [ - '~/Library/Preferences/com.jgraph.drawio.desktop.helper.plist', - '~/Library/Preferences/com.jgraph.drawio.desktop.plist', - ] + zap trash: [ + '~/Library/Preferences/com.jgraph.drawio.desktop.helper.plist', + '~/Library/Preferences/com.jgraph.drawio.desktop.plist', + '~/Library/Saved Application State/com.jgraph.drawio.desktop.savedState', + ] end diff --git a/Casks/dripcap.rb b/Casks/dripcap.rb index c19e373a73e..47743d3589e 100644 --- a/Casks/dripcap.rb +++ b/Casks/dripcap.rb @@ -14,11 +14,11 @@ cask 'dripcap' do uninstall delete: '/Library/PrivilegedHelperTools/org.dripcap.DripcapHelper', launchctl: 'org.dripcap.DripcapHelper' - zap delete: '~/Library/Saved Application State/com.electron.dripcap.savedState', - trash: [ - '~/.dripcap', - '~/Library/Application Support/Dripcap', - '~/Library/Preferences/com.electron.dripcap.helper.plist', - '~/Library/Preferences/com.electron.dripcap.plist', - ] + zap trash: [ + '~/.dripcap', + '~/Library/Application Support/Dripcap', + '~/Library/Preferences/com.electron.dripcap.helper.plist', + '~/Library/Preferences/com.electron.dripcap.plist', + '~/Library/Saved Application State/com.electron.dripcap.savedState', + ] end diff --git a/Casks/dropdmg.rb b/Casks/dropdmg.rb index 48c5f528479..27684fccb44 100644 --- a/Casks/dropdmg.rb +++ b/Casks/dropdmg.rb @@ -8,11 +8,11 @@ cask 'dropdmg' do app 'DropDMG.app' - zap delete: [ - '~/Library/Application Support/DropDMG', - '~/Library/Automator/DropDMG.action', - '~/Library/Automator/Expand Disk Image.action', - '~/Library/Caches/com.c-command.DropDMG', - '~/Library/Preferences/com.c-command.DropDMG.plist', - ] + zap trash: [ + '~/Library/Application Support/DropDMG', + '~/Library/Automator/DropDMG.action', + '~/Library/Automator/Expand Disk Image.action', + '~/Library/Caches/com.c-command.DropDMG', + '~/Library/Preferences/com.c-command.DropDMG.plist', + ] end diff --git a/Casks/dropshare.rb b/Casks/dropshare.rb index e2f8e547ff7..ee069bda37e 100644 --- a/Casks/dropshare.rb +++ b/Casks/dropshare.rb @@ -12,11 +12,11 @@ cask 'dropshare' do app "Dropshare #{version.major}.app" binary "#{appdir}/Dropshare #{version.major}.app/Contents/Resources/ds.sh", target: 'ds' - zap delete: [ - '~/Library/Application Support/Dropshare 4', - '~/Library/Caches/net.mkswap.Dropshare4', - '~/Library/Cookies/net.mkswap.Dropshare4.binarycookies', - '~/Library/Logs/Dropshare 4', - '~/Library/Preferences/net.mkswap.Dropshare4.plist', - ] + zap trash: [ + '~/Library/Application Support/Dropshare 4', + '~/Library/Caches/net.mkswap.Dropshare4', + '~/Library/Cookies/net.mkswap.Dropshare4.binarycookies', + '~/Library/Logs/Dropshare 4', + '~/Library/Preferences/net.mkswap.Dropshare4.plist', + ] end diff --git a/Casks/dusty.rb b/Casks/dusty.rb index dd1702cc2e5..5753a6fd819 100644 --- a/Casks/dusty.rb +++ b/Casks/dusty.rb @@ -20,5 +20,5 @@ cask 'dusty' do uninstall launchctl: 'com.gamechanger.dusty' - zap delete: '/etc/dusty' + zap trash: '/etc/dusty' end