Convert to zap trash: D (#40985)

2017-11-18 19:50:50 +10:00 · 2017-11-18 19:50:50 +10:00 · 6f0056ad9d
parent e1d4ab9e7b
commit 6f0056ad9d
32 changed files with 183 additions and 189 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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