Convert to zap trash (#4808)

7 years ago · 23cc2781f4
68 changed files with 467 additions and 503 deletions
--- a/Casks/1password-beta.rb
+++ b/Casks/1password-beta.rb
@ -12,7 +12,7 @@ cask '1password-beta' do

  app "1Password #{version.major}.app"

-  zap delete: [
+  zap trash: [
               '~/Library/Application Scripts/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
               '~/Library/Containers/2BUA8C4S2C.com.agilebits.onepassword-osx-helper',
               '~/Library/Containers/com.agilebits.onepassword-osx',
--- a/Casks/adium-beta.rb
+++ b/Casks/adium-beta.rb
@ -9,7 +9,7 @@ cask 'adium-beta' do

  app 'Adium.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Caches/Adium',
               '~/Library/Caches/com.adiumX.adiumX',
               '~/Library/Preferences/com.adiumX.adiumX.plist',
--- a/Casks/adobe-air-beta.rb
+++ b/Casks/adobe-air-beta.rb
@ -24,7 +24,7 @@ cask 'adobe-air-beta' do
                      '/Applications/Adobe',
                    ]

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Adobe/AIR',
               '~/Library/Caches/com.adobe.air.ApplicationInstaller',
             ],
--- a/Casks/adobe-photoshop-lightroom441.rb
+++ b/Casks/adobe-photoshop-lightroom441.rb
@ -11,7 +11,7 @@ cask 'adobe-photoshop-lightroom441' do
  uninstall pkgutil: "com.adobe.Lightroom#{version.major}",
            quit:    "com.adobe.Lightroom#{version.major}"

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Adobe/Lightroom',
               "~/Library/Preferences/com.adobe.Lightroom#{version.major}.plist",
             ]
--- a/Casks/adobe-photoshop-lightroom571.rb
+++ b/Casks/adobe-photoshop-lightroom571.rb
@ -11,7 +11,7 @@ cask 'adobe-photoshop-lightroom571' do
  uninstall pkgutil: "com.adobe.Lightroom#{version.major}",
            quit:    "com.adobe.Lightroom#{version.major}"

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Adobe/Lightroom',
               "~/Library/Preferences/com.adobe.Lightroom#{version.major}.plist",
             ]
--- a/Casks/adobe-photoshop-lightroom600.rb
+++ b/Casks/adobe-photoshop-lightroom600.rb
@ -42,7 +42,7 @@ cask 'adobe-photoshop-lightroom600' do

  uninstall delete: '/Applications/Adobe Lightroom/Adobe Lightroom.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Adobe/Lightroom',
               "~/Library/Preferences/com.adobe.Lightroom#{version.major}.plist",
             ]
--- a/Casks/alfred2.rb
+++ b/Casks/alfred2.rb
@ -14,7 +14,7 @@ cask 'alfred2' do
  uninstall quit:       'com.runningwithcrayons.Alfred-2',
            login_item: 'Alfred 2'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Alfred 2',
               '~/Library/Caches/com.runningwithcrayons.Alfred-2',
               '~/Library/Caches/com.runningwithcrayons.Alfred-Preferences',
--- a/Casks/android-studio-preview.rb
+++ b/Casks/android-studio-preview.rb
@ -9,7 +9,7 @@ cask 'android-studio-preview' do

  app "Android Studio #{version.major_minor} Preview.app"

-  zap delete: [
+  zap trash: [
               "~/Library/Application Support/AndroidStudioPreview#{version.major_minor}",
               "~/Library/Caches/AndroidStudioPreview#{version.major_minor}",
               "~/Library/Logs/AndroidStudioPreview#{version.major_minor}",
--- a/Casks/audirvana-plus2.rb
+++ b/Casks/audirvana-plus2.rb
@ -10,7 +10,7 @@ cask 'audirvana-plus2' do

  app 'Audirvana Plus.app'

-  zap delete: [
+  zap trash: [
               '/Library/LaunchDaemons/com.audirvana.Audirvana-Plus.plist',
               '/Library/PrivilegedHelperTools/com.audirvana.Audirvana-Plus',
               '~/Library/Caches/com.audirvana.Audirvana-Plus',
--- a/Casks/charles-applejava.rb
+++ b/Casks/charles-applejava.rb
@ -8,7 +8,7 @@ cask 'charles-applejava' do

  app 'Charles.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Charles',
               '~/Library/Preferences/com.xk72.charles.config',
             ]
--- a/Casks/charles-beta.rb
+++ b/Casks/charles-beta.rb
@ -10,10 +10,10 @@ cask 'charles-beta' do

  uninstall quit: 'com.xk72.Charles'

-  zap delete: '~/Library/Saved Application State/com.xk72.Charles.savedState',
-      trash:  [
+  zap trash: [
               '~/Library/Application Support/Charles',
               '~/Library/Preferences/com.xk72.Charles.plist',
               '~/Library/Preferences/com.xk72.charles.config',
+               '~/Library/Saved Application State/com.xk72.Charles.savedState',
             ]
 end
--- a/Casks/clementine-latest.rb
+++ b/Casks/clementine-latest.rb
@ -27,12 +27,10 @@ cask 'clementine-latest' do
    set_permissions "#{staged_path}/Clementine.app", '0755'
  end

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/Clementine',
               '~/Library/Caches/org.clementine-player.Clementine',
               '~/Library/Saved Application State/org.clementine-player.Clementine.savedState',
-              ],
-      trash:  [
-                '~/Library/Application Support/Clementine',
               '~/Library/Preferences/org.clementine-player.Clementine.plist',
             ]
 end
--- a/Casks/clementine-rc.rb
+++ b/Casks/clementine-rc.rb
@ -13,12 +13,10 @@ cask 'clementine-rc' do

  app 'Clementine.app'

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/Clementine',
               '~/Library/Caches/org.clementine-player.Clementine',
               '~/Library/Saved Application State/org.clementine-player.Clementine.savedState',
-              ],
-      trash:  [
-                '~/Library/Application Support/Clementine',
               '~/Library/Preferences/org.clementine-player.Clementine.plist',
             ]
 end
--- a/Casks/cura-beta.rb
+++ b/Casks/cura-beta.rb
@ -8,5 +8,5 @@ cask 'cura-beta' do

  app 'Cura.app'

-  zap delete: '~/.cura'
+  zap trash: '~/.cura'
 end
--- a/Casks/dash2.rb
+++ b/Casks/dash2.rb
@ -8,7 +8,7 @@ cask 'dash2' do

  app 'Dash.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Dash',
               '~/Library/Preferences/com.kapeli.dash.plist',
               '~/Library/Preferences/com.kapeli.dashdoc.plist',
--- a/Casks/dash3.rb
+++ b/Casks/dash3.rb
@ -12,7 +12,7 @@ cask 'dash3' do

  app 'Dash.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Dash',
               '~/Library/Application Support/com.kapeli.dashdoc',
               '~/Library/Preferences/com.kapeli.dash.plist',
--- a/Casks/discord-ptb.rb
+++ b/Casks/discord-ptb.rb
@ -8,7 +8,7 @@ cask 'discord-ptb' do

  app 'Discord PTB.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/com.hnc.DiscordPTB.plist',
               '~/Library/Saved Application State/com.hnc.DiscordPTB.savedState',
               '~/Library/Caches/com.hnc.DiscordPTB',
--- a/Casks/docker-edge.rb
+++ b/Casks/docker-edge.rb
@ -21,7 +21,7 @@ cask 'docker-edge' do
                       ],
            quit:      'com.docker.docker'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Scripts/com.docker.helper',
               '~/Library/Caches/KSCrashReports/Docker',
               '~/Library/Caches/com.docker.docker',
@ -29,8 +29,8 @@ cask 'docker-edge' do
               '~/Library/Containers/com.docker.docker',
               '~/Library/Containers/com.docker.helper',
               '~/Library/Group Containers/group.com.docker',
+               '~/Library/Preferences/com.docker.docker.plist',
             ],
-      trash:  '~/Library/Preferences/com.docker.docker.plist',
      rmdir: [
               '~/Library/Caches/KSCrashReports',
               '~/Library/Caches/com.plausiblelabs.crashreporter.data',
--- a/Casks/electron-beta.rb
+++ b/Casks/electron-beta.rb
@ -11,7 +11,7 @@ cask 'electron-beta' do

  app 'Electron.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Electron',
               '~/Library/Caches/Electron',
               '~/Library/Preferences/com.github.electron.helper.plist',
--- a/Casks/firefox-beta.rb
+++ b/Casks/firefox-beta.rb
@ -114,14 +114,12 @@ cask 'firefox-beta' do

  app 'Firefox.app'

-  zap delete: [
+  zap trash: [
               '/Library/Logs/DiagnosticReports/firefox_*',
+               '~/Library/Application Support/Firefox',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/org.mozilla.firefox.sfl*',
               '~/Library/Caches/Firefox',
               '~/Library/Caches/Mozilla/updates/Applications/Firefox',
-              ],
-      trash:  [
-                '~/Library/Application Support/Firefox',
               '~/Library/Preferences/org.mozilla.firefox.plist',
             ],
      rmdir: [
--- a/Casks/firefox-esr.rb
+++ b/Casks/firefox-esr.rb
@ -83,7 +83,7 @@ cask 'firefox-esr' do

  app 'Firefox.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Firefox',
               '~/Library/Caches/Firefox',
             ]
--- a/Casks/firefoxnightly.rb
+++ b/Casks/firefoxnightly.rb
@ -28,7 +28,7 @@ cask 'firefoxnightly' do

  app 'FirefoxNightly.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Firefox',
               '~/Library/Caches/Firefox',
             ]
--- a/Casks/forklift-beta.rb
+++ b/Casks/forklift-beta.rb
@ -18,16 +18,14 @@ cask 'forklift-beta' do
                         'com.binarynights.ForkLiftMini',
                       ]

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/ForkLift',
               "~/Library/Caches/com.binarynights.ForkLift-#{version.major}",
               "~/Library/Cookies/com.binarynights.ForkLift-#{version.major}.binarycookies",
               '~/Library/Logs/ForkLift',
               '~/Library/Logs/ForkLiftMini',
-                "~/Library/Saved Application State/com.binarynights.ForkLift-#{version.major}.savedState",
-              ],
-      trash:  [
-                '~/Library/Application Support/ForkLift',
               "~/Library/Preferences/com.binarynights.ForkLift-#{version.major}.plist",
               '~/Library/Preferences/com.binarynights.ForkLiftMini.plist',
+               "~/Library/Saved Application State/com.binarynights.ForkLift-#{version.major}.savedState",
             ]
 end
--- a/Casks/forklift2.rb
+++ b/Casks/forklift2.rb
@ -10,7 +10,7 @@ cask 'forklift2' do

  app 'ForkLift.app'

-  zap delete: [
+  zap trash: [
               "~/Library/Preferences/com.binarynights.ForkLift#{version.major}.plist",
               "~/Library/Caches/com.binarynights.ForkLift#{version.major}",
             ]
--- a/Casks/gemini-classic.rb
+++ b/Casks/gemini-classic.rb
@ -11,7 +11,7 @@ cask 'gemini-classic' do

  app 'MacPaw Gemini.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/MacPaw Gemini',
               '~/Library/Caches/com.macpaw.site.Gemini',
               '~/Library/Preferences/com.macpaw.site.Gemini.plist',
--- a/Casks/github-beta.rb
+++ b/Casks/github-beta.rb
@ -14,17 +14,15 @@ cask 'github-beta' do
  app 'GitHub Desktop.app'
  binary "#{appdir}/GitHub Desktop.app/Contents/Resources/app/static/github.sh", target: 'github'

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/GitHub Desktop',
+               '~/Library/Application Support/com.github.GitHubClient',
+               '~/Library/Application Support/com.github.GitHubClient.ShipIt',
               '~/Library/Application Support/ShipIt_stderr.log',
               '~/Library/Application Support/ShipIt_stdout.log',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.github.GitHubClient.sfl*',
               '~/Library/Caches/com.github.GitHubClient',
               '~/Library/Caches/com.github.GitHubClient.ShipIt',
-              ],
-      trash:  [
-                '~/Library/Application Support/GitHub Desktop',
-                '~/Library/Application Support/com.github.GitHubClient',
-                '~/Library/Application Support/com.github.GitHubClient.ShipIt',
               '~/Library/Preferences/com.github.GitHubClient.helper.plist',
               '~/Library/Preferences/com.github.GitHubClient.plist',
             ],
--- a/Casks/gpg-suite-beta.rb
+++ b/Casks/gpg-suite-beta.rb
@ -59,7 +59,7 @@ cask 'gpg-suite-beta' do
                         '/Library/Frameworks/Libmacgpg.framework',
                       ]

-  zap delete: [
+  zap trash: [
               '~/Library/Services/GPGServices.service',
               '~/Library/Mail/Bundles/GPGMail.mailbundle',
               '~/Library/PreferencePanes/GPGPreferences.prefPane',
@ -68,8 +68,6 @@ cask 'gpg-suite-beta' do
               '~/Library/Frameworks/Libmacgpg.framework',
               '~/Containers/com.apple.mail/Data/Library/Frameworks/Libmacgpg.framework',
               '~/Library/Caches/org.gpgtools.gpg*',
-              ],
-      trash:  [
               '~/Library/Application Support/GPGTools',
               '~/Library/Preferences/org.gpgtools.*',
             ]
--- a/Casks/gpg-suite-nightly.rb
+++ b/Casks/gpg-suite-nightly.rb
@ -63,7 +63,7 @@ cask 'gpg-suite-nightly' do
                         '/Library/Frameworks/Libmacgpg.framework',
                       ]

-  zap delete: [
+  zap trash: [
               '~/Library/Services/GPGServices.service',
               '~/Library/Mail/Bundles/GPGMail.mailbundle',
               '~/Library/PreferencePanes/GPGPreferences.prefPane',
@ -72,8 +72,6 @@ cask 'gpg-suite-nightly' do
               '~/Library/Frameworks/Libmacgpg.framework',
               '~/Containers/com.apple.mail/Data/Library/Frameworks/Libmacgpg.framework',
               '~/Library/Caches/org.gpgtools.gpg*',
-              ],
-      trash:  [
               '~/Library/Application Support/GPGTools',
               '~/Library/Preferences/org.gpgtools.*',
             ]
--- a/Casks/hazel3.rb
+++ b/Casks/hazel3.rb
@ -8,7 +8,7 @@ cask 'hazel3' do

  prefpane 'Install Hazel.app/Contents/Resources/Hazel.prefPane'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Hazel',
               '~/Library/Preferences/com.noodlesoft.Hazel.plist',
               '~/Library/Preferences/com.noodlesoft.HazelHelper.plist',
--- a/Casks/hyper-canary.rb
+++ b/Casks/hyper-canary.rb
@ -11,17 +11,15 @@ cask 'hyper-canary' do

  app 'Hyper.app'

-  zap delete: [
-                '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/co.zeit.hyper.sfl*',
-                '~/Library/Caches/co.zeit.hyper',
-                '~/Library/Caches/co.zeit.hyper.ShipIt',
-                '~/Library/Saved Application State/co.zeit.hyper.savedState',
-              ],
-      trash:  [
+  zap trash: [
               '~/.hyper.js',
               '~/.hyper_plugins',
               '~/Library/Application Support/Hyper',
+               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/co.zeit.hyper.sfl*',
+               '~/Library/Caches/co.zeit.hyper',
+               '~/Library/Caches/co.zeit.hyper.ShipIt',
               '~/Library/Preferences/co.zeit.hyper.plist',
               '~/Library/Preferences/co.zeit.hyper.helper.plist',
+               '~/Library/Saved Application State/co.zeit.hyper.savedState',
             ]
 end
--- a/Casks/intellij-idea20161.rb
+++ b/Casks/intellij-idea20161.rb
@ -14,14 +14,12 @@ cask 'intellij-idea20161' do
    ENV['PATH'].split(File::PATH_SEPARATOR).map { |path| File.join(path, 'idea') }.each { |path| File.delete(path) if File.exist?(path) && File.readlines(path).grep(%r{# see com.intellij.idea.SocketLock for the server side of this interface}).any? }
  end

-  zap delete: [
+  zap trash: [
+               "~/Library/Application Support/IntelliJIdea#{version.major_minor}",
               "~/Library/Caches/IntelliJIdea#{version.major_minor}",
               "~/Library/Logs/IntelliJIdea#{version.major_minor}",
-                '~/Library/Saved Application State/com.jetbrains.intellij.savedState',
-              ],
-      trash:  [
-                "~/Library/Application Support/IntelliJIdea#{version.major_minor}",
               "~/Library/Preferences/IntelliJIdea#{version.major_minor}",
               '~/Library/Preferences/com.jetbrains.intellij.plist',
+               '~/Library/Saved Application State/com.jetbrains.intellij.savedState',
             ]
 end
--- a/Casks/iterm2-beta.rb
+++ b/Casks/iterm2-beta.rb
@ -14,14 +14,12 @@ cask 'iterm2-beta' do

  app 'iTerm.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.googlecode.iterm2.sfl*',
-                '~/Library/Caches/com.googlecode.iterm2',
-                '~/Library/Saved Application State/com.googlecode.iterm2.savedState',
-              ],
-      trash:  [
               '~/Library/Application Support/iTerm',
               '~/Library/Application Support/iTerm2',
+               '~/Library/Caches/com.googlecode.iterm2',
               '~/Library/Preferences/com.googlecode.iterm2.plist',
+               '~/Library/Saved Application State/com.googlecode.iterm2.savedState',
             ]
 end
--- a/Casks/iterm2-legacy.rb
+++ b/Casks/iterm2-legacy.rb
@ -13,5 +13,5 @@ cask 'iterm2-legacy' do

  app 'iTerm.app'

-  zap delete: '~/Library/Preferences/com.googlecode.iterm2.plist'
+  zap trash: '~/Library/Preferences/com.googlecode.iterm2.plist'
 end
--- a/Casks/iterm2-nightly.rb
+++ b/Casks/iterm2-nightly.rb
@ -12,14 +12,12 @@ cask 'iterm2-nightly' do

  app 'iTerm.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.googlecode.iterm2.sfl*',
               '~/Library/Caches/com.googlecode.iterm2',
-                '~/Library/Saved Application State/com.googlecode.iterm2.savedState',
-              ],
-      trash:  [
               '~/Library/Application Support/iTerm',
               '~/Library/Application Support/iTerm2',
               '~/Library/Preferences/com.googlecode.iterm2.plist',
+               '~/Library/Saved Application State/com.googlecode.iterm2.savedState',
             ]
 end
--- a/Casks/java8.rb
+++ b/Casks/java8.rb
@ -70,14 +70,12 @@ cask 'java8' do
                         end,
                       ].keep_if { |v| !v.nil? }

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/Java/',
+               '~/Library/Application Support/Oracle/Java',
               '~/Library/Caches/com.oracle.java.Java-Updater',
               '~/Library/Caches/Oracle.MacJREInstaller',
               '~/Library/Caches/net.java.openjdk.cmd',
-              ],
-      trash:  [
-                '~/Library/Application Support/Java/',
-                '~/Library/Application Support/Oracle/Java',
               '~/Library/Preferences/com.oracle.java.Java-Updater.plist',
               '~/Library/Preferences/com.oracle.java.JavaAppletPlugin.plist',
               '~/Library/Preferences/com.oracle.javadeployment.plist',
--- a/Casks/julia-nightly.rb
+++ b/Casks/julia-nightly.rb
@ -12,5 +12,5 @@ cask 'julia-nightly' do
  app "Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app"
  binary "#{appdir}/Julia-#{version.sub(%r{(.+)-(.+)}, '\1-dev-\2')}.app/Contents/Resources/julia/bin/julia"

-  zap delete: '~/.julia'
+  zap trash: '~/.julia'
 end
--- a/Casks/keka-beta.rb
+++ b/Casks/keka-beta.rb
@ -15,7 +15,7 @@ cask 'keka-beta' do

  app 'Keka.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Keka',
               '~/Library/Caches/com.aone.keka',
               '~/Library/Preferences/com.aone.keka.plist',
--- a/Casks/kicad-nightly.rb
+++ b/Casks/kicad-nightly.rb
@ -21,5 +21,5 @@ cask 'kicad-nightly' do
    end
  end

-  zap delete: '~/Library/Preferences/kicad'
+  zap trash: '~/Library/Preferences/kicad'
 end
--- a/Casks/lilypond-dev.rb
+++ b/Casks/lilypond-dev.rb
@ -31,7 +31,7 @@ cask 'lilypond-dev' do
    end
  end

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/org.lilypond.lilypond.plist',
               '~/Library/Preferences/org.lilypond.lilypond.LSSharedFileList.plist',
             ]
--- a/Casks/lingon-x4.rb
+++ b/Casks/lingon-x4.rb
@ -12,7 +12,7 @@ cask 'lingon-x4' do

  app 'Lingon X.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Scripts/com.peterborgapps.LingonX4Agent',
               '~/Library/Caches/com.peterborgapps.LingonX4',
               '~/Library/Containers/com.peterborgapps.LingonX4Agent',
--- a/Casks/mi-beta.rb
+++ b/Casks/mi-beta.rb
@ -12,6 +12,8 @@ cask 'mi-beta' do

  app 'mi.app'

-  zap delete: '~/Library/Caches/net.mimikaki.mi',
-      trash:  '~/Library/Preferences/net.mimikaki.mi.plist'
+  zap trash: [
+               '~/Library/Caches/net.mimikaki.mi',
+               '~/Library/Preferences/net.mimikaki.mi.plist',
+             ]
 end
--- a/Casks/microsoft-remote-desktop-beta.rb
+++ b/Casks/microsoft-remote-desktop-beta.rb
@ -10,7 +10,7 @@ cask 'microsoft-remote-desktop-beta' do

  app 'Microsoft Remote Desktop Beta.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/com.microsoft.rdc.osx.beta',
               '~/Library/Caches/com.microsoft.rdc.osx.beta',
               '~/Library/Application Support/com.microsoft.rdc.osx.beta',
--- a/Casks/omnifocus-beta.rb
+++ b/Casks/omnifocus-beta.rb
@ -8,7 +8,7 @@ cask 'omnifocus-beta' do

  app 'OmniFocus.app'

-  zap delete: [
+  zap trash: [
               '~/Library/containers/com.omnigroup.omnifocus2',
               '~/Library/Preferences/com.omnigroup.OmniFocus2.LSSharedFileList.plist',
               '~/Library/Preferences/com.omnigroup.OmniSoftwareUpdate.plist',
--- a/Casks/omnigraffle5.rb
+++ b/Casks/omnigraffle5.rb
@ -8,5 +8,5 @@ cask 'omnigraffle5' do

  app 'OmniGraffle 5.app'

-  zap delete: '~/Library/Application Support/The Omni Group/OmniGraffle'
+  zap trash: '~/Library/Application Support/The Omni Group/OmniGraffle'
 end
--- a/Casks/openemu-experimental.rb
+++ b/Casks/openemu-experimental.rb
@ -13,14 +13,11 @@ cask 'openemu-experimental' do

  app 'OpenEmu.app'

-  zap delete: [
-                '~/Library/Caches/org.openemu.OpenEmu',
-                '~/Library/Saved Application State/org.openemu.OpenEmu.savedState',
-                '~/Library/Cookies/org.openemu.OpenEmu.binarycookies',
-              ],
-      trash:  [
+  zap trash: [
               '~/Library/Application Support/OpenEmu',
               '~/Library/Application Support/org.openemu.OEXPCCAgent.Agents',
+               '~/Library/Caches/org.openemu.OpenEmu',
+               '~/Library/Cookies/org.openemu.OpenEmu.binarycookies',
               '~/Library/Preferences/org.openemu.Atari800.plist',
               '~/Library/Preferences/org.openemu.Bliss.plist',
               '~/Library/Preferences/org.openemu.CrabEmu.plist',
@ -44,5 +41,6 @@ cask 'openemu-experimental' do
               '~/Library/Preferences/org.openemu.VecXGL.plist',
               '~/Library/Preferences/org.openemu.VisualBoyAdvance.plist',
               '~/Library/Preferences/org.openemu.mGBA.plist',
+               '~/Library/Saved Application State/org.openemu.OpenEmu.savedState',
             ]
 end
--- a/Casks/parallels11.rb
+++ b/Casks/parallels11.rb
@ -32,7 +32,7 @@ cask 'parallels11' do
                      '/usr/bin/prlsrvctl',
                    ]

-  zap delete: [
+  zap trash: [
               '~/.parallels_settings',
               '~/Library/Caches/com.parallels.desktop.console',
               '~/Library/Preferences/com.parallels.desktop.console.LSSharedFileList.plist',
--- a/Casks/parallels12.rb
+++ b/Casks/parallels12.rb
@ -34,7 +34,7 @@ cask 'parallels12' do
                      '/usr/local/bin/prlsrvctl',
                    ]

-  zap delete: [
+  zap trash: [
               '~/.parallels_settings',
               '~/Library/Caches/com.parallels.desktop.console',
               '~/Library/Preferences/com.parallels.desktop.console.LSSharedFileList.plist',
--- a/Casks/pgadmin3.rb
+++ b/Casks/pgadmin3.rb
@ -11,7 +11,7 @@ cask 'pgadmin3' do

  app 'pgAdmin3.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/pgadmin3 Preferences',
               '~/Library/Saved Application State/org.postgresql.pgadmin.savedState',
             ]
--- a/Casks/porting-kit-legacy.rb
+++ b/Casks/porting-kit-legacy.rb
@ -11,7 +11,7 @@ cask 'porting-kit-legacy' do

  app 'Porting Kit Legacy.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/edu.ufrj.vitormm.Porting-Kit-Legacy.plist',
               '~/Library/Application Support/Porting-Kit-Legacy',
               '~/Library/Saved Application State/edu.ufrj.vitormm.Porting-Kit-Legacy.savedState',
--- a/Casks/processing2.rb
+++ b/Casks/processing2.rb
@ -10,5 +10,5 @@ cask 'processing2' do

  app 'Processing.app'

-  zap delete: '~/Library/Processing/preferences.txt'
+  zap trash: '~/Library/Processing/preferences.txt'
 end
--- a/Casks/psi-plus.rb
+++ b/Casks/psi-plus.rb
@ -13,7 +13,7 @@ cask 'psi-plus' do

  uninstall quit: 'com.googlecode.psi-dev'

-  zap delete: [
+  zap trash: [
               '~/Library/Saved Application State/com.googlecode.psi-dev.savedState',
               '~/Library/Caches/Psi+',
               '~/Library/Application Support/Psi+',
--- a/Casks/rhinoceroswip.rb
+++ b/Casks/rhinoceroswip.rb
@ -13,7 +13,7 @@ cask 'rhinoceroswip' do

  app 'RhinoWIP.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Preferences/com.mcneel.rhinoceros.plist',
               '~/Library/Caches/com.mcneel.rhinoceros',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.mcneel.rhinoceros.sfl*',
--- a/Casks/rstudio-daily.rb
+++ b/Casks/rstudio-daily.rb
@ -8,5 +8,5 @@ cask 'rstudio-daily' do

  app 'RStudio.app'

-  zap delete: '~/.rstudio-desktop'
+  zap trash: '~/.rstudio-desktop'
 end
--- a/Casks/rstudio-preview.rb
+++ b/Casks/rstudio-preview.rb
@ -9,5 +9,5 @@ cask 'rstudio-preview' do

  app 'RStudio.app'

-  zap delete: '~/.rstudio-desktop'
+  zap trash: '~/.rstudio-desktop'
 end
--- a/Casks/safari-technology-preview.rb
+++ b/Casks/safari-technology-preview.rb
@ -18,17 +18,15 @@ cask 'safari-technology-preview' do

  uninstall delete: '/Applications/Safari Technology Preview.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.apple.safaritechnologypreview.sfl*',
               '~/Library/Caches/com.apple.SafariTechnologyPreview',
-                '~/Library/Saved Application State/com.apple.SafariTechnologyPreview.savedState',
-                '~/Library/WebKit/com.apple.SafariTechnologyPreview',
-              ],
-      trash:  [
               '~/Library/Preferences/com.apple.SafariTechnologyPreview.plist',
               '~/Library/SafariTechnologyPreview',
+               '~/Library/Saved Application State/com.apple.SafariTechnologyPreview.savedState',
               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.UserRequests.plist',
               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.WebFeedSubscriptions.plist',
               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview.plist',
+               '~/Library/WebKit/com.apple.SafariTechnologyPreview',
             ]
 end
--- a/Casks/sequel-pro-nightly.rb
+++ b/Casks/sequel-pro-nightly.rb
@ -15,5 +15,5 @@ cask 'sequel-pro-nightly' do

  app 'Sequel Pro.app'

-  zap delete: '~/Library/Application Support/Sequel Pro/Data'
+  zap trash: '~/Library/Application Support/Sequel Pro/Data'
 end
--- a/Casks/shimo3.rb
+++ b/Casks/shimo3.rb
@ -9,7 +9,7 @@ cask 'shimo3' do

  app 'Shimo.app'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Shimo',
               '~/Library/Preferences/com.chungwasoft.Shimo.plist',
               '~/Library/Caches/com.chungwasoft.Shimo',
--- a/Casks/slack-beta.rb
+++ b/Casks/slack-beta.rb
@ -13,7 +13,7 @@ cask 'slack-beta' do

  uninstall quit: 'com.tinyspeck.slackmacgap'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.tinyspeck.slackmacgap.sfl*',
               '~/Library/Application Support/Slack',
               '~/Library/Caches/com.tinyspeck.slackmacgap',
--- a/Casks/sourcetree-alpha.rb
+++ b/Casks/sourcetree-alpha.rb
@ -18,7 +18,7 @@ cask 'sourcetree-alpha' do
  uninstall launchctl: 'com.atlassian.SourceTreePrivilegedHelper2',
            quit:      'com.torusknot.SourceTreeNotMAS'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/SourceTree',
               '~/Library/Caches/com.torusknot.SourceTreeNotMAS',
               '~/Library/Preferences/com.torusknot.SourceTreeNotMAS.plist',
--- a/Casks/sourcetree-beta.rb
+++ b/Casks/sourcetree-beta.rb
@ -18,7 +18,7 @@ cask 'sourcetree-beta' do
  uninstall launchctl: 'com.atlassian.SourceTreePrivilegedHelper2',
            quit:      'com.torusknot.SourceTreeNotMAS'

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/SourceTree',
               '~/Library/Caches/com.torusknot.SourceTreeNotMAS',
               '~/Library/Preferences/com.torusknot.SourceTreeNotMAS.plist',
--- a/Casks/sublime-text-dev.rb
+++ b/Casks/sublime-text-dev.rb
@ -15,12 +15,10 @@ cask 'sublime-text-dev' do

  uninstall quit: 'com.sublimetext.3'

-  zap delete: [
-                '~/Library/Caches/com.sublimetext.3',
-                '~/Library/Saved Application State/com.sublimetext.3.savedState',
-              ],
-      trash:  [
+  zap trash: [
               '~/Library/Application Support/Sublime Text 3',
+               '~/Library/Caches/com.sublimetext.3',
               '~/Library/Preferences/com.sublimetext.3.plist',
+               '~/Library/Saved Application State/com.sublimetext.3.savedState',
             ]
 end
--- a/Casks/sublime-text2.rb
+++ b/Casks/sublime-text2.rb
@ -11,7 +11,7 @@ cask 'sublime-text2' do
  app 'Sublime Text 2.app'
  binary "#{appdir}/Sublime Text 2.app/Contents/SharedSupport/bin/subl"

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/Sublime Text 2',
               '~/Library/Preferences/com.sublimetext.2.plist',
               '~/Library/Caches/com.sublimetext.2',
--- a/Casks/tower-beta.rb
+++ b/Casks/tower-beta.rb
@ -12,7 +12,7 @@ cask 'tower-beta' do
  app 'Tower.app'
  binary "#{appdir}/Tower.app/Contents/MacOS/gittower"

-  zap delete: [
+  zap trash: [
               '~/Library/Application Support/com.fournova.Tower2',
               '~/Library/Caches/com.fournova.Tower2',
               '~/Library/Preferences/com.fournova.Tower2.plist',
--- a/Casks/tunnelblick-beta.rb
+++ b/Casks/tunnelblick-beta.rb
@ -23,13 +23,11 @@ cask 'tunnelblick-beta' do
                       ],
            quit:      'net.tunnelblick.tunnelblick'

-  zap delete: [
-                '~/Library/Caches/com.apple.helpd/SDMHelpData/Other/English/HelpSDMIndexFile/net.tunnelblick.tunnelblick.help*',
-                '~/Library/Caches/net.tunnelblick.tunnelblick',
-              ],
-      trash:  [
+  zap trash: [
               '/Library/Application Support/Tunnelblick',
               '~/Library/Application Support/Tunnelblick',
+               '~/Library/Caches/com.apple.helpd/SDMHelpData/Other/English/HelpSDMIndexFile/net.tunnelblick.tunnelblick.help*',
+               '~/Library/Caches/net.tunnelblick.tunnelblick',
               '~/Library/Preferences/net.tunnelblick.tunnelblick.plist',
             ]

--- a/Casks/virtualbox-beta.rb
+++ b/Casks/virtualbox-beta.rb
@ -25,17 +25,15 @@ cask 'virtualbox-beta' do
                     },
            pkgutil: 'org.virtualbox.pkg.*'

-  zap delete: [
+  zap trash: [
+               '/Library/Application Support/VirtualBox',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/org.virtualbox.app.virtualbox.sfl*',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/org.virtualbox.app.virtualboxvm.sfl*',
+               '~/Library/Preferences/org.virtualbox.app.VirtualBox.plist',
+               '~/Library/Preferences/org.virtualbox.app.VirtualBoxVM.plist',
               '~/Library/Saved Application State/org.virtualbox.app.VirtualBox.savedState',
               '~/Library/Saved Application State/org.virtualbox.app.VirtualBoxVM.savedState',
-              ],
-      trash:  [
-                '/Library/Application Support/VirtualBox',
               '~/Library/VirtualBox',
-                '~/Library/Preferences/org.virtualbox.app.VirtualBox.plist',
-                '~/Library/Preferences/org.virtualbox.app.VirtualBoxVM.plist',
             ],
      rmdir: '~/VirtualBox VMs'
 end
--- a/Casks/visual-studio-code-insiders.rb
+++ b/Casks/visual-studio-code-insiders.rb
@ -16,13 +16,11 @@ cask 'visual-studio-code-insiders' do
  app 'Visual Studio Code - Insiders.app'
  binary "#{appdir}/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"

-  zap delete: [
+  zap trash: [
+               '~/Library/Application Support/Code - Insiders',
               '~/Library/Caches/Code - Insiders',
               '~/Library/Caches/com.microsoft.VSCodeInsiders',
               '~/Library/Caches/com.microsoft.VSCodeInsiders.ShipIt',
-              ],
-      trash:  [
-                '~/Library/Application Support/Code - Insiders',
               '~/Library/Preferences/com.microsoft.VSCodeInsiders.helper.plist',
               '~/Library/Preferences/com.microsoft.VSCodeInsiders.plist',
             ]
--- a/Casks/vmware-fusion7.rb
+++ b/Casks/vmware-fusion7.rb
@ -17,7 +17,7 @@ cask 'vmware-fusion7' do
    set_ownership "#{appdir}/VMware Fusion.app"
  end

-  zap delete: [
+  zap trash: [
               # note: '~/Library/Application Support/VMware Fusion' is not safe
               # to delete. In older versions, VM images were located there.
               '~/Library/Caches/com.vmware.fusion',
--- a/Casks/vmware-fusion8.rb
+++ b/Casks/vmware-fusion8.rb
@ -44,24 +44,18 @@ cask 'vmware-fusion8' do
    set_ownership "#{appdir}/VMware Fusion.app"
  end

-  zap delete: [
+  zap trash: [
+               '/Library/Application Support/VMware',
               '/Library/Logs/VMware Fusion Services.log',
               '/Library/Logs/VMware USB Arbitrator Service.log',
               '/Library/Logs/VMware',
+               '/Library/Preferences/VMware Fusion',
               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.vmware.fusion.sfl*',
+               '~/Library/Application Support/VMware Fusion',
               '~/Library/Caches/com.vmware.fusion',
               '~/Library/Logs/VMware Fusion',
               '~/Library/Logs/VMware Graphics Service.log',
               '~/Library/Logs/VMware',
-                '~/Library/Preferences/com.vmware.fusion.LSSharedFileList.plist',
-                '~/Library/Preferences/com.vmware.fusion.LSSharedFileList.plist.lockfile',
-                '~/Library/Saved Application State/com.vmware.fusion.savedState',
-                '~/Library/WebKit/com.vmware.fusion',
-              ],
-      trash:  [
-                '/Library/Application Support/VMware',
-                '/Library/Preferences/VMware Fusion',
-                '~/Library/Application Support/VMware Fusion',
               '~/Library/Preferences/VMware Fusion',
               '~/Library/Preferences/com.vmware.fusion.plist',
               '~/Library/Preferences/com.vmware.fusion.plist.lockfile',
@ -69,5 +63,9 @@ cask 'vmware-fusion8' do
               '~/Library/Preferences/com.vmware.fusionDaemon.plist.lockfile',
               '~/Library/Preferences/com.vmware.fusionStartMenu.plist',
               '~/Library/Preferences/com.vmware.fusionStartMenu.plist.lockfile',
+               '~/Library/Preferences/com.vmware.fusion.LSSharedFileList.plist',
+               '~/Library/Preferences/com.vmware.fusion.LSSharedFileList.plist.lockfile',
+               '~/Library/Saved Application State/com.vmware.fusion.savedState',
+               '~/Library/WebKit/com.vmware.fusion',
             ]
 end