diff --git a/Casks/a/adguard-vpn.rb b/Casks/a/adguard-vpn.rb index 840ad28237..ecca7a4017 100644 --- a/Casks/a/adguard-vpn.rb +++ b/Casks/a/adguard-vpn.rb @@ -20,8 +20,8 @@ cask "adguard-vpn" do pkg "AdGuard VPN.pkg" - uninstall quit: "com.adguard.mac.vpn", - launchctl: "com.adguard.mac.vpn.tun-helper", + uninstall launchctl: "com.adguard.mac.vpn.tun-helper", + quit: "com.adguard.mac.vpn", pkgutil: "com.adguard.mac.vpn-pkg", delete: [ "/Library/Application Support/AdGuard Software/com.adguard.mac.vpn", diff --git a/Casks/a/adguard.rb b/Casks/a/adguard.rb index 3ac5608510..ca3f63ecc3 100644 --- a/Casks/a/adguard.rb +++ b/Casks/a/adguard.rb @@ -20,14 +20,14 @@ cask "adguard" do pkg "AdGuard.pkg" - uninstall quit: "com.adguard.mac.adguard", - pkgutil: "com.adguard.mac.adguard-pkg", - launchctl: [ + uninstall launchctl: [ "com.adguard.mac.adguard.pac", "com.adguard.mac.adguard.helper", "com.adguard.mac.adguard.tun-helper", "com.adguard.mac.adguard.xpcgate2", ], + quit: "com.adguard.mac.adguard", + pkgutil: "com.adguard.mac.adguard-pkg", delete: [ "/Library/Application Support/AdGuard Software/com.adguard.mac.adguard", "/Library/Application Support/com.adguard.Adguard", @@ -35,7 +35,8 @@ cask "adguard" do ], rmdir: "/Library/Application Support/AdGuard Software" - zap trash: [ + zap delete: "/Library/Logs/com.adguard.mac.adguard", + trash: [ "~/Library/Application Scripts/*.com.adguard.mac*", "~/Library/Application Support/Adguard", "~/Library/Application Support/com.adguard.*", @@ -48,6 +49,5 @@ cask "adguard" do "~/Library/Logs/Adguard", "~/Library/Preferences/com.adguard.*.plist", "~/Library/Saved Application State/com.adguard.mac.adguard.savedState", - ], - delete: "/Library/Logs/com.adguard.mac.adguard" + ] end diff --git a/Casks/a/adobe-acrobat-pro.rb b/Casks/a/adobe-acrobat-pro.rb index c6e1e96810..5a39e3709a 100644 --- a/Casks/a/adobe-acrobat-pro.rb +++ b/Casks/a/adobe-acrobat-pro.rb @@ -18,13 +18,7 @@ cask "adobe-acrobat-pro" do pkg "Acrobat/Acrobat DC Installer.pkg" - uninstall pkgutil: [ - "com.adobe.acrobat.DC.*", - "com.adobe.AcroServicesUpdater", - "com.adobe.armdc.app.pkg", - "com.adobe.PDApp.AdobeApplicationManager.installer.pkg", - ], - launchctl: [ + uninstall launchctl: [ "Adobe_Genuine_Software_Integrity_Service", "com.adobe.AAM.Startup-1.0", "com.adobe.AAM.Updater-1.0", @@ -33,6 +27,12 @@ cask "adobe-acrobat-pro" do "com.adobe.ARMDC.SMJobBlessHelper", "com.adobe.ARMDCHelper.cc24aef4a1b90ed56a725c38014c95072f92651fb65e1bf9c8e43c37a23d420d", ], + pkgutil: [ + "com.adobe.acrobat.DC.*", + "com.adobe.AcroServicesUpdater", + "com.adobe.armdc.app.pkg", + "com.adobe.PDApp.AdobeApplicationManager.installer.pkg", + ], delete: "/Applications/Adobe Acrobat DC/" zap trash: [ diff --git a/Casks/a/adobe-acrobat-reader.rb b/Casks/a/adobe-acrobat-reader.rb index 5c53c2272f..290270ac62 100644 --- a/Casks/a/adobe-acrobat-reader.rb +++ b/Casks/a/adobe-acrobat-reader.rb @@ -16,7 +16,17 @@ cask "adobe-acrobat-reader" do pkg "AcroRdrDC_#{version.no_dots}_MUI.pkg" - uninstall pkgutil: [ + uninstall launchctl: [ + "com.adobe.ARMDC.Communicator", + "com.adobe.ARMDC.SMJobBlessHelper", + "com.adobe.ARMDCHelper.cc24aef4a1b90ed56a725c38014c95072f92651fb65e1bf9c8e43c37a23d420d", + ], + quit: [ + "com.adobe.AdobeRdrCEF", + "com.adobe.AdobeRdrCEFHelper", + "com.adobe.Reader", + ], + pkgutil: [ "com.adobe.acrobat.DC.reader.*", "com.adobe.armdc.app.pkg", "com.adobe.RdrServicesUpdater", @@ -24,16 +34,6 @@ cask "adobe-acrobat-reader" do delete: [ "/Applications/Adobe Acrobat Reader.app", "/Library/Preferences/com.adobe.reader.DC.WebResource.plist", - ], - quit: [ - "com.adobe.AdobeRdrCEF", - "com.adobe.AdobeRdrCEFHelper", - "com.adobe.Reader", - ], - launchctl: [ - "com.adobe.ARMDC.Communicator", - "com.adobe.ARMDC.SMJobBlessHelper", - "com.adobe.ARMDCHelper.cc24aef4a1b90ed56a725c38014c95072f92651fb65e1bf9c8e43c37a23d420d", ] zap trash: [ diff --git a/Casks/a/airparrot.rb b/Casks/a/airparrot.rb index 1a4ada7d38..36db5f593d 100644 --- a/Casks/a/airparrot.rb +++ b/Casks/a/airparrot.rb @@ -14,14 +14,14 @@ cask "airparrot" do app "AirParrot #{version.major}.app" - uninstall kext: [ + uninstall quit: "com.squirrels.AirParrot-#{version.major}", + kext: [ "/Library/Extensions/AirParrotDriver.kext", "/Library/Extensions/APExtFramebuffer.kext", "/System/Library/Extensions/AirParrotDriver.kext", "/System/Library/Extensions/APExtFramebuffer.kext", "com.squirrels.driver.AirParrotSpeakers", - ], - quit: "com.squirrels.AirParrot-#{version.major}" + ] zap trash: "~/Library/Preferences/com.squirrels.AirParrot-*.plist" end diff --git a/Casks/a/airtool.rb b/Casks/a/airtool.rb index e915853944..2fd63c3726 100644 --- a/Casks/a/airtool.rb +++ b/Casks/a/airtool.rb @@ -21,12 +21,12 @@ cask "airtool" do set_ownership "/Library/Application Support/Airtool #{version.major}" end - uninstall pkgutil: [ + uninstall launchctl: "com.intuitibits.airtool#{version.major}.airtool-bpf", + login_item: "Airtool", + pkgutil: [ "com.intuitibits.airtool-helper.pkg", "com.intuitibits.airtool#{version.major}.pkg", ], - launchctl: "com.intuitibits.airtool#{version.major}.airtool-bpf", - login_item: "Airtool", delete: "/Library/Application Support/Airtool #{version.major}" zap trash: [ diff --git a/Casks/a/aldente.rb b/Casks/a/aldente.rb index 5b98e76b0c..5ac978b131 100644 --- a/Casks/a/aldente.rb +++ b/Casks/a/aldente.rb @@ -17,8 +17,8 @@ cask "aldente" do app "AlDente.app" - uninstall quit: "com.apphousekitchen.aldente-pro", - launchctl: "com.apphousekitchen.aldente-pro.helper", + uninstall launchctl: "com.apphousekitchen.aldente-pro.helper", + quit: "com.apphousekitchen.aldente-pro", login_item: "AlDente", delete: "/Library/PrivilegedHelperTools/com.apphousekitchen.aldente-pro.helper" diff --git a/Casks/a/alfred.rb b/Casks/a/alfred.rb index 1394c61efb..abdff5c3a2 100644 --- a/Casks/a/alfred.rb +++ b/Casks/a/alfred.rb @@ -20,8 +20,8 @@ cask "alfred" do app "Alfred #{version.major}.app" - uninstall login_item: "Alfred#{version.major}", - quit: "com.runningwithcrayons.Alfred" + uninstall quit: "com.runningwithcrayons.Alfred", + login_item: "Alfred#{version.major}" zap trash: [ "~/Library/Application Support/Alfred", diff --git a/Casks/a/amazon-music.rb b/Casks/a/amazon-music.rb index a33c0f1655..df2674b27a 100644 --- a/Casks/a/amazon-music.rb +++ b/Casks/a/amazon-music.rb @@ -20,15 +20,15 @@ cask "amazon-music" do executable: "Amazon Music Installer.app/Contents/MacOS/installbuilder.sh", } - uninstall quit: [ + uninstall launchctl: [ + "com.amazon.music", + "com.amazon.music.startup", + ], + quit: [ "com.amazon.music", "com.amazon.music-renderer", ], - delete: "/Applications/Amazon Music.app", - launchctl: [ - "com.amazon.music", - "com.amazon.music.startup", - ] + delete: "/Applications/Amazon Music.app" zap trash: [ "~/Library/Application Support/Amazon Music", diff --git a/Casks/a/amazon-photos.rb b/Casks/a/amazon-photos.rb index 1605e4ba3b..c96af34a67 100644 --- a/Casks/a/amazon-photos.rb +++ b/Casks/a/amazon-photos.rb @@ -19,9 +19,9 @@ cask "amazon-photos" do args: ["--quiet"], } - uninstall quit: "com.amazon.clouddrive.mac", - delete: "/Applications/Amazon Photos.app", - launchctl: "com.amazon.clouddrive" + uninstall launchctl: "com.amazon.clouddrive", + quit: "com.amazon.clouddrive.mac", + delete: "/Applications/Amazon Photos.app" zap trash: [ "~/Library/Application Scripts/Amazon Cloud Drive", diff --git a/Casks/a/amazon-workdocs-drive.rb b/Casks/a/amazon-workdocs-drive.rb index 670fcab0b3..fa4cf492ba 100644 --- a/Casks/a/amazon-workdocs-drive.rb +++ b/Casks/a/amazon-workdocs-drive.rb @@ -19,12 +19,12 @@ cask "amazon-workdocs-drive" do pkg "AmazonWorkDocsDrive.pkg" - uninstall signal: ["TERM", "com.Amazon.WorkDocs.Drive"], + uninstall launchctl: "com.Amazon.WorkDocs.DriveUpdater", + signal: ["TERM", "com.Amazon.WorkDocs.Drive"], pkgutil: [ "com.Amazon.WorkDocs.Drive", "com.Amazon.WorkDocs.Drive.pkg.core", - ], - launchctl: "com.Amazon.WorkDocs.DriveUpdater" + ] zap trash: [ "~/Library/Application Scripts/com.Amazon.WorkDocs.DriveFinderExtension", diff --git a/Casks/a/appcleaner.rb b/Casks/a/appcleaner.rb index d89ae7ab6e..66f3d69be9 100644 --- a/Casks/a/appcleaner.rb +++ b/Casks/a/appcleaner.rb @@ -35,8 +35,8 @@ cask "appcleaner" do app "AppCleaner.app" - uninstall quit: "net.freemacsoft.AppCleaner", - launchctl: "net.freemacsoft.AppCleaner-SmartDelete" + uninstall launchctl: "net.freemacsoft.AppCleaner-SmartDelete", + quit: "net.freemacsoft.AppCleaner" zap trash: [ "~/Library/Caches/net.freemacsoft.AppCleaner", diff --git a/Casks/a/appgate-sdp-client.rb b/Casks/a/appgate-sdp-client.rb index a22cb8fb20..8179cd86a4 100644 --- a/Casks/a/appgate-sdp-client.rb +++ b/Casks/a/appgate-sdp-client.rb @@ -55,8 +55,7 @@ cask "appgate-sdp-client" do pkg "AppGate SDP Installer.pkg" - uninstall pkgutil: "com.appgate.pkg.appgatetun.component", - launchctl: [ + uninstall launchctl: [ "com.appgate.sdp.client.agent", "com.appgate.sdp.tun", "com.appgate.sdp.updater", @@ -70,7 +69,8 @@ cask "appgate-sdp-client" do "com.cyxtera.appgate.helper", "com.cyxtera.appgate.sdp", ], - signal: ["QUIT", "com.cyxtera.appgate"] + signal: ["QUIT", "com.cyxtera.appgate"], + pkgutil: "com.appgate.pkg.appgatetun.component" zap trash: [ "~/Library/Application Support/appgate-ui", diff --git a/Casks/a/arq-cloud-backup.rb b/Casks/a/arq-cloud-backup.rb index a4b8549bb1..c132c5003b 100644 --- a/Casks/a/arq-cloud-backup.rb +++ b/Casks/a/arq-cloud-backup.rb @@ -14,7 +14,7 @@ cask "arq-cloud-backup" do pkg "Install Arq Cloud Backup.pkg" - uninstall pkgutil: "com.haystacksoftware.ArqCloudBackup", + uninstall launchctl: "com.haystacksoftware.arqcloudagent", quit: "com.haystacksoftware.ArqCloudBackup", - launchctl: "com.haystacksoftware.arqcloudagent" + pkgutil: "com.haystacksoftware.ArqCloudBackup" end diff --git a/Casks/a/arq.rb b/Casks/a/arq.rb index 30e5747dc9..c8d3ee3935 100644 --- a/Casks/a/arq.rb +++ b/Casks/a/arq.rb @@ -16,13 +16,13 @@ cask "arq" do pkg "Arq#{version}.pkg" - uninstall pkgutil: "com.haystacksoftware.Arq", - quit: "com.haystacksoftware.Arq", - delete: "/Applications/Arq.app", - launchctl: [ + uninstall launchctl: [ "com.haystacksoftware.arqagent", "com.haystacksoftware.ArqMonitor", - ] + ], + quit: "com.haystacksoftware.Arq", + pkgutil: "com.haystacksoftware.Arq", + delete: "/Applications/Arq.app" zap trash: [ "/Library/Application Support/ArqAgent", diff --git a/Casks/a/asciidocfx.rb b/Casks/a/asciidocfx.rb index f970c08514..666db15486 100644 --- a/Casks/a/asciidocfx.rb +++ b/Casks/a/asciidocfx.rb @@ -23,11 +23,11 @@ cask "asciidocfx" do sudo: true, } - zap trash: [ + zap delete: "/Library/Preferences/com.install4j.installations.plist", + trash: [ "~/.AsciidocFX-#{version}", "~/Library/Preferences/com.install4j.7853-9376-5862-1224.24.plist", "~/Library/Preferences/com.install4j.installations.plist", "~/Library/Saved Application State/com.install4j.7853-9376-5862-1224.24.savedState", - ], - delete: "/Library/Preferences/com.install4j.installations.plist" + ] end diff --git a/Casks/a/atok.rb b/Casks/a/atok.rb index f0edbb9d9a..df4dd5e40b 100644 --- a/Casks/a/atok.rb +++ b/Casks/a/atok.rb @@ -17,15 +17,7 @@ cask "atok" do pkg "ATOK インストーラ.pkg" - uninstall pkgutil: [ - "com.justsystems.atok#{version.major}.doc.pkg", - "com.justsystems.atok#{version.major}.pkg", - "com.justsystems.atok#{version.major}.quicklook.pkg", - "com.justsystems.atok#{version.major}.sync.pkg", - "com.justsystems.JustOnlineUpdate.pkg", - "com.justsystems.pkg.lma", - ], - launchctl: [ + uninstall launchctl: [ "com.justsystems.atok#{version.major}.enabler", "com.justsystems.inputmethod.atok#{version.major}", "com.justsystems.launchd.Atok#{version.major}.AlBg", @@ -34,5 +26,13 @@ cask "atok" do "com.justsystems.launchd.UpdateChecker", "com.justsystems.OnlineUpdate", ], - quit: "com.justsystems.UpdateChecker" + quit: "com.justsystems.UpdateChecker", + pkgutil: [ + "com.justsystems.atok#{version.major}.doc.pkg", + "com.justsystems.atok#{version.major}.pkg", + "com.justsystems.atok#{version.major}.quicklook.pkg", + "com.justsystems.atok#{version.major}.sync.pkg", + "com.justsystems.JustOnlineUpdate.pkg", + "com.justsystems.pkg.lma", + ] end diff --git a/Casks/a/avast-security.rb b/Casks/a/avast-security.rb index d8022265ee..9095acc231 100644 --- a/Casks/a/avast-security.rb +++ b/Casks/a/avast-security.rb @@ -16,16 +16,16 @@ cask "avast-security" do # pkg cannot be installed automatically installer manual: "Install Avast Security.pkg" - uninstall script: { - executable: "/Applications/Avast.app/Contents/Backend/hub/uninstall.sh", - must_succeed: false, # A non-0 exit code may be given even if the uninstall succeeds (https://github.com/Homebrew/homebrew-cask/issues/21740#issuecomment-224094946). - sudo: true, - }, - launchctl: [ + uninstall launchctl: [ "com.avast.hub", "com.avast.hub.schedule", "com.avast.hub.xpc", ], + script: { + executable: "/Applications/Avast.app/Contents/Backend/hub/uninstall.sh", + must_succeed: false, # A non-0 exit code may be given even if the uninstall succeeds (https://github.com/Homebrew/homebrew-cask/issues/21740#issuecomment-224094946). + sudo: true, + }, pkgutil: [ "com.avast.AAFM", "com.avast.pkg.hub", diff --git a/Casks/a/avg-antivirus.rb b/Casks/a/avg-antivirus.rb index fcfd01717c..236176f561 100644 --- a/Casks/a/avg-antivirus.rb +++ b/Casks/a/avg-antivirus.rb @@ -15,16 +15,16 @@ cask "avg-antivirus" do pkg "AVG AntiVirus.pkg" - uninstall script: { - executable: "/Applications/AVGAntivirus.app/Contents/Backend/hub/uninstall.sh", - sudo: true, - }, - pkgutil: "com.avg.pkg.hub", - launchctl: [ + uninstall launchctl: [ "com.avg.hub", "com.avg.hub.schedule", "com.avg.hub.xpc", - ] + ], + script: { + executable: "/Applications/AVGAntivirus.app/Contents/Backend/hub/uninstall.sh", + sudo: true, + }, + pkgutil: "com.avg.pkg.hub" zap trash: [ "/Library/Application Support/AVGAntivirus", diff --git a/Casks/a/aviatrix-vpn-client.rb b/Casks/a/aviatrix-vpn-client.rb index ef63290bdb..072e9ad071 100644 --- a/Casks/a/aviatrix-vpn-client.rb +++ b/Casks/a/aviatrix-vpn-client.rb @@ -15,7 +15,7 @@ cask "aviatrix-vpn-client" do pkg "AVPNC_mac.pkg" - uninstall pkgutil: "com.Aviatrix.VPNClient", - delete: "/Applications/Aviatrix VPN Client.app", - launchctl: "aviatrix.vpn.client.rp.plist" + uninstall launchctl: "aviatrix.vpn.client.rp.plist", + pkgutil: "com.Aviatrix.VPNClient", + delete: "/Applications/Aviatrix VPN Client.app" end diff --git a/Casks/a/aws-vpn-client.rb b/Casks/a/aws-vpn-client.rb index 031880cf8a..22c7bba978 100644 --- a/Casks/a/aws-vpn-client.rb +++ b/Casks/a/aws-vpn-client.rb @@ -17,9 +17,9 @@ cask "aws-vpn-client" do pkg "AWS_VPN_Client.pkg" - uninstall pkgutil: "com.amazon.awsvpnclient", + uninstall launchctl: "com.amazonaws.acvc.helper", quit: "com.amazonaws.acvc.osx", - launchctl: "com.amazonaws.acvc.helper", + pkgutil: "com.amazon.awsvpnclient", delete: [ "/Library/Application Support/AWSVPNClient", "/Library/LaunchDaemons/com.amazonaws.acvc.helper.plist", diff --git a/Casks/b/background-music.rb b/Casks/b/background-music.rb index fedcbf7812..70bdd0bfaf 100644 --- a/Casks/b/background-music.rb +++ b/Casks/b/background-music.rb @@ -25,14 +25,14 @@ cask "background-music" do must_succeed: true end - uninstall delete: [ + uninstall launchctl: "com.bearisdriving.BGM.XPCHelper", + quit: "com.bearisdriving.BGM.App", + pkgutil: "com.bearisdriving.BGM", + delete: [ "/Library/Application Support/Background Music", "/Library/Audio/Plug-Ins/HAL/Background Music Device.driver", "/usr/local/libexec/BGMXPCHelper.xpc", - ], - pkgutil: "com.bearisdriving.BGM", - quit: "com.bearisdriving.BGM.App", - launchctl: "com.bearisdriving.BGM.XPCHelper" + ] zap trash: [ "/Library/LaunchDaemons/com.bearisdriving.BGM.XPCHelper.plist", diff --git a/Casks/b/ballast.rb b/Casks/b/ballast.rb index 47de452b5f..09f1fef018 100644 --- a/Casks/b/ballast.rb +++ b/Casks/b/ballast.rb @@ -12,8 +12,8 @@ cask "ballast" do app "ballast.app" - uninstall quit: "nz.jamsinclair.ballast", - launchctl: "nz.jamsinclair.ballast-LaunchAtLoginHelper" + uninstall launchctl: "nz.jamsinclair.ballast-LaunchAtLoginHelper", + quit: "nz.jamsinclair.ballast" zap trash: [ "~/Library/Preferences/nz.jamsinclair.ballast.plist", diff --git a/Casks/b/bartender.rb b/Casks/b/bartender.rb index 3665118d27..10ab093d95 100644 --- a/Casks/b/bartender.rb +++ b/Casks/b/bartender.rb @@ -26,14 +26,14 @@ cask "bartender" do app "Bartender #{version.major}.app" - uninstall delete: [ + uninstall launchctl: "com.surteesstudios.Bartender.BartenderInstallHelper", + quit: "com.surteesstudios.Bartender", + delete: [ "/Library/Audio/Plug-Ins/HAL/BartenderAudioPlugIn.plugin", "/Library/PrivilegedHelperTools/com.surteesstudios.Bartender.BartenderInstallHelper", "/Library/ScriptingAdditions/BartenderHelper.osax", "/System/Library/ScriptingAdditions/BartenderSystemHelper.osax", - ], - launchctl: "com.surteesstudios.Bartender.BartenderInstallHelper", - quit: "com.surteesstudios.Bartender" + ] zap trash: [ "~/Library/Caches/com.surteesstudios.Bartender", diff --git a/Casks/b/beamer.rb b/Casks/b/beamer.rb index fe8f98baad..0ce1cb3569 100644 --- a/Casks/b/beamer.rb +++ b/Casks/b/beamer.rb @@ -16,13 +16,13 @@ cask "beamer" do app "Beamer.app" - zap rmdir: "/Users/Shared/Beamer", - trash: [ + zap trash: [ "~/Library/Application Support/Beamer", "~/Library/Caches/com.softorino.beamer", "~/Library/HTTPStorages/com.softorino.beamer", "~/Library/Logs/Beamer", "~/Library/Preferences/com.softorino.beamer.plist", "~/Library/Saved Application State/com.softorino.beamer.savedState", - ] + ], + rmdir: "/Users/Shared/Beamer" end diff --git a/Casks/b/berrycast.rb b/Casks/b/berrycast.rb index 4853ef7def..edfe663841 100644 --- a/Casks/b/berrycast.rb +++ b/Casks/b/berrycast.rb @@ -17,14 +17,14 @@ cask "berrycast" do app "Berrycast.app" - uninstall login_item: "Berrycast", - quit: [ + uninstall quit: [ "com.openmindt.berrycast", "com.openmindt.berrycast.helper", "com.openmindt.berrycast.helper.GPU", "com.openmindt.berrycast.helper.Plugin", "com.openmindt.berrycast.helper.Renderer", - ] + ], + login_item: "Berrycast" zap trash: [ "~/Library/Application Support/berrycast-desktop", diff --git a/Casks/b/betterandbetter.rb b/Casks/b/betterandbetter.rb index a25cb37199..e46ea8ed0c 100644 --- a/Casks/b/betterandbetter.rb +++ b/Casks/b/betterandbetter.rb @@ -14,12 +14,12 @@ cask "betterandbetter" do pkg "BetterAndBetter#{version}Beta.pkg" - uninstall pkgutil: [ + uninstall launchctl: "cn.better365.BetterAndBetterHelper", + quit: "cn.better365.BetterAndBetter", + pkgutil: [ "cn.better365.BetterAndBetter", "cn.better365.BetterAndBetterHelper", - ], - launchctl: "cn.better365.BetterAndBetterHelper", - quit: "cn.better365.BetterAndBetter" + ] zap trash: [ "~/Library/Application Support/BetterAndBetter", diff --git a/Casks/b/bing-wallpaper.rb b/Casks/b/bing-wallpaper.rb index 0a7e265cfc..ed2b9435c4 100644 --- a/Casks/b/bing-wallpaper.rb +++ b/Casks/b/bing-wallpaper.rb @@ -16,13 +16,13 @@ cask "bing-wallpaper" do pkg "Bing Wallpaper.pkg" - uninstall pkgutil: "com.microsoft.msbwpackage", + uninstall launchctl: [ + "com.microsoft.msbwapp", + "com.microsoft.msbwupdater", + ], quit: [ "com.microsoft.autoupdate2", "com.microsoft.msbwdefaults", ], - launchctl: [ - "com.microsoft.msbwapp", - "com.microsoft.msbwupdater", - ] + pkgutil: "com.microsoft.msbwpackage" end diff --git a/Casks/b/bingpaper.rb b/Casks/b/bingpaper.rb index cd9c8a8455..660a55eb59 100644 --- a/Casks/b/bingpaper.rb +++ b/Casks/b/bingpaper.rb @@ -16,11 +16,11 @@ cask "bingpaper" do uninstall launchctl: "io.pjw.mac.BingPaperLoginItem", quit: "io.pjw.mac.BingPaper" - zap rmdir: "~/Pictures/BingPaper", - trash: [ + zap trash: [ "~/Library/Application Scripts/io.pjw.mac.BingPaper", "~/Library/Application Scripts/io.pjw.mac.BingPaperLoginItem", "~/Library/Containers/io.pjw.mac.BingPaper", "~/Library/Containers/io.pjw.mac.BingPaperLoginItem", - ] + ], + rmdir: "~/Pictures/BingPaper" end diff --git a/Casks/b/bluebubbles.rb b/Casks/b/bluebubbles.rb index e7aa9d63a6..334175c5ef 100644 --- a/Casks/b/bluebubbles.rb +++ b/Casks/b/bluebubbles.rb @@ -18,7 +18,6 @@ cask "bluebubbles" do app "BlueBubbles.app" uninstall launchctl: "com.BlueBubbles.BlueBubbles-Server.ShipIt", - login_item: "BlueBubbles", quit: [ "com.BlueBubbles.BlueBubbles-Server", "com.BlueBubbles.BlueBubbles-Server.helper", @@ -26,7 +25,8 @@ cask "bluebubbles" do "com.BlueBubbles.BlueBubbles-Server.helper.Plugin", "com.BlueBubbles.BlueBubbles-Server.helper.Renderer", "com.bluebubbles.messaging", - ] + ], + login_item: "BlueBubbles" zap trash: [ "~/Library/Application Support/@bluebubbles", diff --git a/Casks/b/blueharvest.rb b/Casks/b/blueharvest.rb index a40db7e00f..04098ac4db 100644 --- a/Casks/b/blueharvest.rb +++ b/Casks/b/blueharvest.rb @@ -17,9 +17,9 @@ cask "blueharvest" do app "BlueHarvest.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.zeroonetwenty.BlueHarvestHelper#{version.major}", - launchctl: "com.zeroonetwenty.BlueHarvestHelper#{version.major}", - quit: "com.zeroonetwenty.BlueHarvest5" + uninstall launchctl: "com.zeroonetwenty.BlueHarvestHelper#{version.major}", + quit: "com.zeroonetwenty.BlueHarvest5", + delete: "/Library/PrivilegedHelperTools/com.zeroonetwenty.BlueHarvestHelper#{version.major}" zap trash: [ "~/Library/Caches/com.zeroonetwenty.BlueHarvest5", diff --git a/Casks/b/blurred.rb b/Casks/b/blurred.rb index ccae33078f..5d40181360 100644 --- a/Casks/b/blurred.rb +++ b/Casks/b/blurred.rb @@ -11,8 +11,8 @@ cask "blurred" do app "Blurred.app" - uninstall quit: "foundation.dwarves.blurred", - launchctl: "foundation.dwarves.blurredlaunche" + uninstall launchctl: "foundation.dwarves.blurredlaunche", + quit: "foundation.dwarves.blurred" zap trash: [ "~/Library/Application Scripts/foundation.dwarves.blurred", diff --git a/Casks/b/boinc.rb b/Casks/b/boinc.rb index a9bee7c309..2675512728 100644 --- a/Casks/b/boinc.rb +++ b/Casks/b/boinc.rb @@ -15,12 +15,12 @@ cask "boinc" do pkg "boinc_#{version}_macOSX_universal/BOINC Installer.app/Contents/Resources/BOINC.pkg" - uninstall pkgutil: "edu.berkeley.boinc", - launchctl: [ + uninstall launchctl: [ "edu.berkeley.boinc-sshelper", "edu.berkeley.launchBOINCManager", ], - quit: "edu.berkeley.boinc.finish-install" + quit: "edu.berkeley.boinc.finish-install", + pkgutil: "edu.berkeley.boinc" zap trash: [ "/Library/Application Support/BOINC Data", diff --git a/Casks/b/boom.rb b/Casks/b/boom.rb index 48c1716ca7..c6861b27dc 100644 --- a/Casks/b/boom.rb +++ b/Casks/b/boom.rb @@ -15,9 +15,9 @@ cask "boom" do app "Boom 2.app" - uninstall kext: "com.globaldelight.driver.Boom2Device", - launchctl: "com.globaldelight.Boom2Daemon", - signal: ["TERM", "com.globaldelight.Boom2"] + uninstall launchctl: "com.globaldelight.Boom2Daemon", + signal: ["TERM", "com.globaldelight.Boom2"], + kext: "com.globaldelight.driver.Boom2Device" zap trash: [ "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.globaldelight.boom2.sfl*", diff --git a/Casks/b/box-drive.rb b/Casks/b/box-drive.rb index 635c284551..36384ac250 100644 --- a/Casks/b/box-drive.rb +++ b/Casks/b/box-drive.rb @@ -21,16 +21,16 @@ cask "box-drive" do pkg "BoxDrive.pkg" - uninstall pkgutil: "com.box.desktop.installer.*", - launchctl: "com.box.desktop.helper", - script: "/Library/Application Support/Box/uninstall_box_drive", + uninstall launchctl: "com.box.desktop.helper", quit: [ "com.box.Box-Local-Com-Server", "com.box.desktop", "com.box.desktop.findersyncext", "com.box.desktop.helper", "com.box.desktop.ui", - ] + ], + script: "/Library/Application Support/Box/uninstall_box_drive", + pkgutil: "com.box.desktop.installer.*" zap trash: [ "~/Library/Application Support/Box/Box", diff --git a/Casks/b/breaktimer.rb b/Casks/b/breaktimer.rb index 01d9a50dff..4efdfa3efc 100644 --- a/Casks/b/breaktimer.rb +++ b/Casks/b/breaktimer.rb @@ -13,8 +13,8 @@ cask "breaktimer" do app "BreakTimer.app" binary "#{appdir}/BreakTimer.app/Contents/MacOS/BreakTimer", target: "breaktimer" - uninstall quit: "com.tomjwatson.breaktimer", - launchctl: "com.tomjwatson.breaktimer.ShipIt" + uninstall launchctl: "com.tomjwatson.breaktimer.ShipIt", + quit: "com.tomjwatson.breaktimer" zap trash: [ "~/Library/Application Support/BreakTimer", diff --git a/Casks/b/busycal.rb b/Casks/b/busycal.rb index d2dda543be..b522f78116 100644 --- a/Casks/b/busycal.rb +++ b/Casks/b/busycal.rb @@ -24,9 +24,9 @@ cask "busycal" do pkg "BusyCal Installer.pkg" uninstall launchctl: "N4RA379GBW.com.busymac.busycal3.alarm", - pkgutil: "com.busymac.busycal3.pkg", quit: "N4RA379GBW.com.busymac.busycal3.alarm", signal: ["TERM", "com.busymac.busycal3"], + pkgutil: "com.busymac.busycal3.pkg", delete: "/Applications/BusyCal.app" zap trash: [ diff --git a/Casks/b/busycontacts.rb b/Casks/b/busycontacts.rb index ab870a9113..0c415322a7 100644 --- a/Casks/b/busycontacts.rb +++ b/Casks/b/busycontacts.rb @@ -22,9 +22,9 @@ cask "busycontacts" do pkg "BusyContacts Installer.pkg" - uninstall pkgutil: "com.busymac.busycontacts.pkg", - quit: "com.busymac.busycontacts", - signal: ["KILL", "com.busymac.busycontacts"] + uninstall quit: "com.busymac.busycontacts", + signal: ["KILL", "com.busymac.busycontacts"], + pkgutil: "com.busymac.busycontacts.pkg" zap trash: [ "~/Library/Application Scripts/com.busymac.busycontacts", diff --git a/Casks/c/carbon-copy-cloner.rb b/Casks/c/carbon-copy-cloner.rb index 9baa8f4024..c46b0514c2 100644 --- a/Casks/c/carbon-copy-cloner.rb +++ b/Casks/c/carbon-copy-cloner.rb @@ -18,11 +18,11 @@ cask "carbon-copy-cloner" do app "Carbon Copy Cloner.app" - uninstall login_item: "CCC User Agent", - quit: [ + uninstall quit: [ "com.bombich.ccc", "com.bombich.cccuseragent", - ] + ], + login_item: "CCC User Agent" zap trash: [ "~/Library/Application Support/com.bombich.ccc", diff --git a/Casks/c/ccleaner.rb b/Casks/c/ccleaner.rb index 303c8afeff..95745ef0f8 100644 --- a/Casks/c/ccleaner.rb +++ b/Casks/c/ccleaner.rb @@ -14,9 +14,7 @@ cask "ccleaner" do pkg "Install CCleaner.pkg" - uninstall quit: "com.piriform.ccleaner", - pkgutil: "com.piriform.pkg.CCleaner", - launchctl: [ + uninstall launchctl: [ "com.piriform.CCleaner", "com.piriform.ccleaner.CCleanerAgent", "com.piriform.ccleaner (com.piriform.CCleaner)", @@ -27,6 +25,8 @@ cask "ccleaner" do "com.piriform.ccleaner.update", "com.piriform.ccleaner.update.xpc", ], + quit: "com.piriform.ccleaner", + pkgutil: "com.piriform.pkg.CCleaner", delete: "/Library/PrivilegedHelperTools/com.piriform.ccleaner.CCleanerAgent" zap trash: [ diff --git a/Casks/c/charles.rb b/Casks/c/charles.rb index 2d1dbfe90f..889a1a5638 100644 --- a/Casks/c/charles.rb +++ b/Casks/c/charles.rb @@ -26,8 +26,8 @@ cask "charles" do end end - uninstall quit: "com.xk72.Charles", - launchctl: "com.xk72.Charles.ProxyHelper", + uninstall launchctl: "com.xk72.Charles.ProxyHelper", + quit: "com.xk72.Charles", delete: "/Library/PrivilegedHelperTools/com.xk72.Charles.ProxyHelper" zap trash: [ diff --git a/Casks/c/chef-workstation.rb b/Casks/c/chef-workstation.rb index f782fb3536..ffce039958 100644 --- a/Casks/c/chef-workstation.rb +++ b/Casks/c/chef-workstation.rb @@ -21,16 +21,16 @@ cask "chef-workstation" do pkg "chef-workstation-#{version}-1.#{arch}.pkg" - uninstall quit: "sh.chef.chef-workstation", - pkgutil: "com.getchef.pkg.chef-workstation", - launchctl: [ + uninstall launchctl: [ "io.chef.chef-workstation", "io.chef.chef-workstation.app", ], + quit: "sh.chef.chef-workstation", script: { executable: "/opt/chef-workstation/bin/uninstall_chef_workstation", sudo: true, - } + }, + pkgutil: "com.getchef.pkg.chef-workstation" zap trash: "~/.chef-workstation/" end diff --git a/Casks/c/choosy.rb b/Casks/c/choosy.rb index ffde7c8e32..58750731c2 100644 --- a/Casks/c/choosy.rb +++ b/Casks/c/choosy.rb @@ -68,8 +68,8 @@ cask "choosy" do desc "Open links in any browser" homepage "https://choosy.app/" - uninstall pkgutil: "com.choosyosx.Choosy", - quit: "com.choosyosx.Choosy" + uninstall quit: "com.choosyosx.Choosy", + pkgutil: "com.choosyosx.Choosy" zap trash: [ "~/Library/Application Support/Choosy", diff --git a/Casks/c/chrome-remote-desktop-host.rb b/Casks/c/chrome-remote-desktop-host.rb index 40e86b974f..042868d139 100644 --- a/Casks/c/chrome-remote-desktop-host.rb +++ b/Casks/c/chrome-remote-desktop-host.rb @@ -14,15 +14,15 @@ cask "chrome-remote-desktop-host" do pkg "Chrome Remote Desktop Host.pkg" - uninstall script: { + uninstall launchctl: [ + "com.google.GoogleUpdater.wake.system", + "org.chromium.chromoting", + ], + script: { executable: "/Applications/Chrome Remote Desktop Host Uninstaller.app/Contents/MacOS/remoting_host_uninstaller", args: ["--no-ui"], sudo: true, }, - launchctl: [ - "com.google.GoogleUpdater.wake.system", - "org.chromium.chromoting", - ], pkgutil: [ "com.google.pkg.ChromeRemoteDesktopHost", "com.google.pkg.ChromeRemoteDesktopHostService", diff --git a/Casks/c/chronoagent.rb b/Casks/c/chronoagent.rb index bb21738f51..164cf7963c 100644 --- a/Casks/c/chronoagent.rb +++ b/Casks/c/chronoagent.rb @@ -16,9 +16,9 @@ cask "chronoagent" do pkg "Install.pkg" - uninstall pkgutil: "com.econtechnologies.pkg.ChronoAgent", - launchctl: "com.econtechnologies.ChronoAgentRemote", - quit: "com.econtechnologies.backgrounder.CAMonitorBackgrounder" + uninstall launchctl: "com.econtechnologies.ChronoAgentRemote", + quit: "com.econtechnologies.backgrounder.CAMonitorBackgrounder", + pkgutil: "com.econtechnologies.pkg.ChronoAgent" zap trash: [ "~/Library/Caches/com.apple.helpd/Generated/ChronoAgent Help Center*", diff --git a/Casks/c/cinc-workstation.rb b/Casks/c/cinc-workstation.rb index 07b4d7aac1..0b89d8ca15 100644 --- a/Casks/c/cinc-workstation.rb +++ b/Casks/c/cinc-workstation.rb @@ -19,12 +19,12 @@ cask "cinc-workstation" do pkg "cinc-workstation-#{version}-1.#{arch}.pkg" - uninstall pkgutil: "com.cinc-project.pkg.cinc-workstation", - launchctl: "io.chef.chef-workstation.app", + uninstall launchctl: "io.chef.chef-workstation.app", script: { executable: "/opt/cinc-workstation/bin/uninstall_chef_workstation", sudo: true, - } + }, + pkgutil: "com.cinc-project.pkg.cinc-workstation" zap trash: "~/.cinc-workstation/" end diff --git a/Casks/c/ckb-next.rb b/Casks/c/ckb-next.rb index 0f9a4ee8e5..e30720f2bb 100644 --- a/Casks/c/ckb-next.rb +++ b/Casks/c/ckb-next.rb @@ -13,9 +13,9 @@ cask "ckb-next" do pkg "ckb-next.mpkg" - uninstall pkgutil: [ + uninstall launchctl: "org.ckb-next.daemon", + pkgutil: [ "org.ckb-next.ckb", "org.ckb-next.daemon", - ], - launchctl: "org.ckb-next.daemon" + ] end diff --git a/Casks/c/cleaneronepro.rb b/Casks/c/cleaneronepro.rb index 6c7808b9a3..eaf9a7f539 100644 --- a/Casks/c/cleaneronepro.rb +++ b/Casks/c/cleaneronepro.rb @@ -17,12 +17,12 @@ cask "cleaneronepro" do app "CleanerOnePro.app" - uninstall delete: [ + uninstall launchctl: "com.trendmicro.TrendCleanerPro.HelperTool", + quit: "com.trendmicro.TrendCleanerPro", + delete: [ "/Library/LaunchDaemons/com.trendmicro.TrendCleanerPro.HelperTool.plist", "/Library/PrivilegedHelperTools/com.trendmicro.TrendCleanerPro.HelperTool", - ], - launchctl: "com.trendmicro.TrendCleanerPro.HelperTool", - quit: "com.trendmicro.TrendCleanerPro" + ] zap trash: [ "~/Library/Application Support/com.trendmicro.TrendCleanerPro", diff --git a/Casks/c/cleanmymac-zh.rb b/Casks/c/cleanmymac-zh.rb index ef49f492cd..4f8e89b955 100644 --- a/Casks/c/cleanmymac-zh.rb +++ b/Casks/c/cleanmymac-zh.rb @@ -19,22 +19,22 @@ cask "cleanmymac-zh" do app "CleanMyMac-X.app" - uninstall delete: [ - "/Library/LaunchDaemons/com.macpaw.zh.CleanMyMac#{version.major}.Agent.plist", - "/Library/PrivilegedHelperTools/com.macpaw.zh.CleanMyMac#{version.major}.Agent", - ], - launchctl: [ + uninstall launchctl: [ "com.macpaw.zh.CleanMyMac#{version.major}.Agent", "com.macpaw.zh.CleanMyMac#{version.major}.HealthMonitor", "com.macpaw.zh.CleanMyMac#{version.major}.Menu", "com.macpaw.zh.CleanMyMac#{version.major}.Scheduler", "com.macpaw.zh.CleanMyMac#{version.major}.Updater", ], - login_item: "CleanMyMac #{version.major} Menu", quit: [ "com.macpaw.zh.CleanMyMac#{version.major}", "com.macpaw.zh.CleanMyMac#{version.major}.HealthMonitor", "com.macpaw.zh.CleanMyMac#{version.major}.Menu", + ], + login_item: "CleanMyMac #{version.major} Menu", + delete: [ + "/Library/LaunchDaemons/com.macpaw.zh.CleanMyMac#{version.major}.Agent.plist", + "/Library/PrivilegedHelperTools/com.macpaw.zh.CleanMyMac#{version.major}.Agent", ] zap trash: [ diff --git a/Casks/c/cleanmymac.rb b/Casks/c/cleanmymac.rb index 9cf676dbf3..3b2229d9d0 100644 --- a/Casks/c/cleanmymac.rb +++ b/Casks/c/cleanmymac.rb @@ -19,22 +19,22 @@ cask "cleanmymac" do app "CleanMyMac X.app" - uninstall delete: [ - "/Library/LaunchDaemons/com.macpaw.CleanMyMac#{version.major}.Agent.plist", - "/Library/PrivilegedHelperTools/com.macpaw.CleanMyMac#{version.major}.Agent", - ], - launchctl: [ + uninstall launchctl: [ "com.macpaw.CleanMyMac#{version.major}.Agent", "com.macpaw.CleanMyMac#{version.major}.HealthMonitor", "com.macpaw.CleanMyMac#{version.major}.Menu", "com.macpaw.CleanMyMac#{version.major}.Scheduler", "com.macpaw.CleanMyMac#{version.major}.Updater", ], - login_item: "CleanMyMac #{version.major} Menu", quit: [ "com.macpaw.CleanMyMac#{version.major}", "com.macpaw.CleanMyMac#{version.major}.HealthMonitor", "com.macpaw.CleanMyMac#{version.major}.Menu", + ], + login_item: "CleanMyMac #{version.major} Menu", + delete: [ + "/Library/LaunchDaemons/com.macpaw.CleanMyMac#{version.major}.Agent.plist", + "/Library/PrivilegedHelperTools/com.macpaw.CleanMyMac#{version.major}.Agent", ] zap trash: [ diff --git a/Casks/c/cloudnet.rb b/Casks/c/cloudnet.rb index 8303923715..cd85f7586f 100644 --- a/Casks/c/cloudnet.rb +++ b/Casks/c/cloudnet.rb @@ -22,8 +22,8 @@ cask "cloudnet" do sudo: true, } - uninstall quit: "world.cloudnet.client", - launchctl: "world.cloudnet.client.cloudnetd", + uninstall launchctl: "world.cloudnet.client.cloudnetd", + quit: "world.cloudnet.client", script: { executable: "CloudNet.app/Contents/Resources/cnet", args: ["uninstall"], diff --git a/Casks/c/code42-crashplan.rb b/Casks/c/code42-crashplan.rb index 7ab379c176..5522e83df9 100644 --- a/Casks/c/code42-crashplan.rb +++ b/Casks/c/code42-crashplan.rb @@ -15,9 +15,9 @@ cask "code42-crashplan" do pkg "Install Code42.pkg" uninstall launchctl: "com.backup42.desktop", - pkgutil: "com.code42.app.pkg", script: { executable: "Uninstall.app/Contents/Resources/uninstall.sh", sudo: true, - } + }, + pkgutil: "com.code42.app.pkg" end diff --git a/Casks/c/commandpost.rb b/Casks/c/commandpost.rb index 04e248b5ba..7c4b72ddb9 100644 --- a/Casks/c/commandpost.rb +++ b/Casks/c/commandpost.rb @@ -32,8 +32,8 @@ cask "commandpost" do app "CommandPost.app" binary "#{appdir}/CommandPost.app/Contents/Frameworks/hs/cmdpost" - uninstall login_item: "CommandPost", - quit: "org.latenitefilms.CommandPost" + uninstall quit: "org.latenitefilms.CommandPost", + login_item: "CommandPost" zap trash: [ "~/Library/Application Support/CommandPost", diff --git a/Casks/c/controllermate.rb b/Casks/c/controllermate.rb index 2922b2cb0d..7be4f4feb0 100644 --- a/Casks/c/controllermate.rb +++ b/Casks/c/controllermate.rb @@ -26,14 +26,14 @@ cask "controllermate" do "com.orderedbytes.ControllerMateHelper", "com.orderedbytes.ControllerMate.KextHelper", ], - kext: [ - "com.orderedbytes.driver.CMUSBDevices", - "com.orderedbytes.driver.ControllerMateFamily", - ], signal: [ ["TERM", "com.orderedbytes.ControllerMate#{version.major}"], ["TERM", "com.orderedbytes.ControllerMateHelper"], ], + kext: [ + "com.orderedbytes.driver.CMUSBDevices", + "com.orderedbytes.driver.ControllerMateFamily", + ], delete: [ "/Library/Extensions/ControllerMate.kext,/Library/Application Support/ControllerMate/", "/Library/LaunchAgents/com.orderedbytes.ControllerMateHelper.plist", diff --git a/Casks/d/daisydisk.rb b/Casks/d/daisydisk.rb index a467ea0483..bc1242cb34 100644 --- a/Casks/d/daisydisk.rb +++ b/Casks/d/daisydisk.rb @@ -17,8 +17,8 @@ cask "daisydisk" do app "DaisyDisk.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.daisydiskapp.DaisyDiskAdminHelper", - launchctl: "com.daisydiskapp.DaisyDiskAdminHelper" + uninstall launchctl: "com.daisydiskapp.DaisyDiskAdminHelper", + delete: "/Library/PrivilegedHelperTools/com.daisydiskapp.DaisyDiskAdminHelper" zap trash: [ "~/Library/Application Support/DaisyDisk", diff --git a/Casks/d/datadog-agent.rb b/Casks/d/datadog-agent.rb index 8e2481fa3f..70f4b16b30 100644 --- a/Casks/d/datadog-agent.rb +++ b/Casks/d/datadog-agent.rb @@ -15,8 +15,8 @@ cask "datadog-agent" do installer manual: "datadog-agent-#{version}.pkg" - uninstall quit: "com.datadoghq.agent", - launchctl: "com.datadoghq.agent", + uninstall launchctl: "com.datadoghq.agent", + quit: "com.datadoghq.agent", pkgutil: "com.datadoghq.agent", delete: [ "/Applications/Datadog Agent.app", diff --git a/Casks/d/debookee.rb b/Casks/d/debookee.rb index c47e73ff1b..7f1d84f1a1 100644 --- a/Casks/d/debookee.rb +++ b/Casks/d/debookee.rb @@ -18,8 +18,8 @@ cask "debookee" do app "Debookee.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.iwaxx.Debookee.PacketTool", - launchctl: "com.iwaxx.Debookee.PacketTool" + uninstall launchctl: "com.iwaxx.Debookee.PacketTool", + delete: "/Library/PrivilegedHelperTools/com.iwaxx.Debookee.PacketTool" zap trash: [ "~/.debookee", diff --git a/Casks/d/displaylink.rb b/Casks/d/displaylink.rb index df4725de15..a29ba72228 100644 --- a/Casks/d/displaylink.rb +++ b/Casks/d/displaylink.rb @@ -56,19 +56,14 @@ cask "displaylink" do skip "No version information available" end - uninstall pkgutil: "com.displaylink.*", - # 'kextunload -b com.displaylink.driver.DisplayLinkDriver' causes kernel panic - # kext: [ - # 'com.displaylink.dlusbncm' - # 'com.displaylink.driver.DisplayLinkDriver', - # ], - launchctl: [ + uninstall launchctl: [ "73YQY62QM3.com.displaylink.DisplayLinkAPServer", "com.displaylink.displaylinkmanager", "com.displaylink.useragent-prelogin", "com.displaylink.useragent", ], quit: "DisplayLinkUserAgent", + pkgutil: "com.displaylink.*", delete: [ "/Applications/DisplayLink", "/Library/LaunchAgents/com.displaylink.useragent-prelogin.plist", diff --git a/Casks/d/docker.rb b/Casks/d/docker.rb index c3923706ed..954b81f8d0 100644 --- a/Casks/d/docker.rb +++ b/Casks/d/docker.rb @@ -100,17 +100,17 @@ cask "docker" do end end - uninstall delete: [ - "/Library/PrivilegedHelperTools/com.docker.socket", - "/Library/PrivilegedHelperTools/com.docker.vmnetd", - ], - rmdir: "~/.docker/bin", - launchctl: [ + uninstall launchctl: [ "com.docker.helper", "com.docker.socket", "com.docker.vmnetd", ], - quit: "com.docker.docker" + quit: "com.docker.docker", + delete: [ + "/Library/PrivilegedHelperTools/com.docker.socket", + "/Library/PrivilegedHelperTools/com.docker.vmnetd", + ], + rmdir: "~/.docker/bin" zap trash: [ "/usr/local/bin/docker-compose.backup", diff --git a/Casks/d/dymo-label.rb b/Casks/d/dymo-label.rb index 07328542dc..47e94a2782 100644 --- a/Casks/d/dymo-label.rb +++ b/Casks/d/dymo-label.rb @@ -17,8 +17,8 @@ cask "dymo-label" do "com.dymo.dcd.webservice", "com.dymo.pnpd", ], - pkgutil: "com.dymo.dymo-connect", - quit: "com.dymo.DYMO-WebApi-Mac-Host" + quit: "com.dymo.DYMO-WebApi-Mac-Host", + pkgutil: "com.dymo.dymo-connect" zap trash: "~/Library/Preferences/com.dymo.DYMO-WebApi-Mac-Host.plist" end diff --git a/Casks/e/ecodms-client.rb b/Casks/e/ecodms-client.rb index 356e1ad4d0..c4f0994385 100644 --- a/Casks/e/ecodms-client.rb +++ b/Casks/e/ecodms-client.rb @@ -16,11 +16,11 @@ cask "ecodms-client" do pkg "ecoDMS-Clients_#{version}.pkg" - uninstall pkgutil: "de.applord.pkg.ecodms", - quit: [ + uninstall quit: [ "de.applord.ecoDMS-Client", "de.applord.ecoDMS-Connection-Manager", - ] + ], + pkgutil: "de.applord.pkg.ecodms" zap trash: [ "~/Library/Preferences/com.applord-gmbh.ecoDMS - Profilemanager.plist", diff --git a/Casks/e/elektron-overbridge.rb b/Casks/e/elektron-overbridge.rb index 5f36704091..4112fb87f5 100644 --- a/Casks/e/elektron-overbridge.rb +++ b/Casks/e/elektron-overbridge.rb @@ -20,12 +20,12 @@ cask "elektron-overbridge" do pkg "Elektron Overbridge Installer #{version.csv.first}.pkg" - uninstall quit: "se.elektron.OverbridgeEngine", - pkgutil: "se.elektron.overbridge.*", - launchctl: [ + uninstall launchctl: [ "se.elektron.overbridge.engine", "asp.se.elektron.overbridge.coreaudio2", ], + quit: "se.elektron.OverbridgeEngine", + pkgutil: "se.elektron.overbridge.*", delete: "/Applications/Elektron" zap trash: [ diff --git a/Casks/e/elgato-camera-hub.rb b/Casks/e/elgato-camera-hub.rb index d9ea79b15e..4edc915ef6 100644 --- a/Casks/e/elgato-camera-hub.rb +++ b/Casks/e/elgato-camera-hub.rb @@ -16,9 +16,9 @@ cask "elgato-camera-hub" do pkg "Camera_Hub_#{version}.pkg" - uninstall signal: ["TERM", "com.elgato.CameraHub"], - launchctl: "com.elgato.CameraHub", + uninstall launchctl: "com.elgato.CameraHub", quit: "com.displaylink.DisplayLinkUserAgent", + signal: ["TERM", "com.elgato.CameraHub"], pkgutil: [ "com.displaylink.displaylinkmanagerapp", "com.elgato.CameraHub.Installer", diff --git a/Casks/e/elgato-stream-deck.rb b/Casks/e/elgato-stream-deck.rb index 907aa71fa3..e213541b81 100644 --- a/Casks/e/elgato-stream-deck.rb +++ b/Casks/e/elgato-stream-deck.rb @@ -17,10 +17,10 @@ cask "elgato-stream-deck" do pkg "Stream_Deck_#{version}.pkg" - uninstall delete: "/Applications/Elgato Stream Deck.app", - launchctl: "com.elgato.StreamDeck", + uninstall launchctl: "com.elgato.StreamDeck", quit: "com.elgato.StreamDeck", - pkgutil: "com.elgato.StreamDeck" + pkgutil: "com.elgato.StreamDeck", + delete: "/Applications/Elgato Stream Deck.app" zap trash: [ "~/Library/Application Support/com.elgato.StreamDeck", diff --git a/Casks/e/elgato-wave-link.rb b/Casks/e/elgato-wave-link.rb index 0702fda0b9..6841f51c1c 100644 --- a/Casks/e/elgato-wave-link.rb +++ b/Casks/e/elgato-wave-link.rb @@ -17,10 +17,10 @@ cask "elgato-wave-link" do pkg "WaveLink_#{version}.pkg" - uninstall delete: "/Applications/Elgato Wave Link.app", - launchctl: "com.elgato.WaveLink", + uninstall launchctl: "com.elgato.WaveLink", quit: "com.elgato.WaveLink", - pkgutil: "com.elgato.pkg.WaveLink" + pkgutil: "com.elgato.pkg.WaveLink", + delete: "/Applications/Elgato Wave Link.app" zap trash: [ "~/Library/Logs/WaveLink", diff --git a/Casks/e/emclient.rb b/Casks/e/emclient.rb index 22f91d3b4e..f6a5190e41 100644 --- a/Casks/e/emclient.rb +++ b/Casks/e/emclient.rb @@ -18,8 +18,8 @@ cask "emclient" do pkg "setup.pkg" - uninstall delete: "/Applications/eM Client.app", - pkgutil: "com.emclient.mail.client.pkg" + uninstall pkgutil: "com.emclient.mail.client.pkg", + delete: "/Applications/eM Client.app" zap trash: [ "~/Library/Caches/com.emclient.mail.client", diff --git a/Casks/e/endurance.rb b/Casks/e/endurance.rb index 94a03ba669..d50628688e 100644 --- a/Casks/e/endurance.rb +++ b/Casks/e/endurance.rb @@ -14,6 +14,6 @@ cask "endurance" do app "Endurance.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.MagnetismStudios.endurance.helper", - launchctl: "com.MagnetismStudios.endurance.helper" + uninstall launchctl: "com.MagnetismStudios.endurance.helper", + delete: "/Library/PrivilegedHelperTools/com.MagnetismStudios.endurance.helper" end diff --git a/Casks/e/eobcanka.rb b/Casks/e/eobcanka.rb index 9b50fbb84e..bf73fec158 100644 --- a/Casks/e/eobcanka.rb +++ b/Casks/e/eobcanka.rb @@ -16,14 +16,14 @@ cask "eobcanka" do pkg "eObcanka.pkg" - uninstall pkgutil: [ - "com.Monet.pkg.CryptoPlusEOPCTK", - "com.Monet.pkg.CryptoPlusEOP", - ], - quit: [ + uninstall quit: [ "cz.monetplus.eOP.Eop2v1CzeTokenApp", "cz.monetplus.eOP.EopCzeTokenApp", "com.monetplus.cardmanager", "cz.monetplus.eOb--anka-Identifikace", + ], + pkgutil: [ + "com.Monet.pkg.CryptoPlusEOPCTK", + "com.Monet.pkg.CryptoPlusEOP", ] end diff --git a/Casks/e/eset-cyber-security-pro.rb b/Casks/e/eset-cyber-security-pro.rb index ed38cfdb15..081b5fc459 100644 --- a/Casks/e/eset-cyber-security-pro.rb +++ b/Casks/e/eset-cyber-security-pro.rb @@ -14,7 +14,11 @@ cask "eset-cyber-security-pro" do pkg "Resources/Installer.pkg" - uninstall script: { + uninstall launchctl: [ + "com.eset.esets_daemon", + "com.eset.esets_pidmapper", + ], + script: { executable: "/Applications/ESET Cyber Security Pro.app/Contents/Helpers/Uninstaller.app/Contents/Scripts/uninstall.sh", sudo: true, }, @@ -26,10 +30,6 @@ cask "eset-cyber-security-pro" do "com.eset.esetCyberSecurityPro.GUI_startup.pkg", "com.eset.esetCyberSecurityPro.pkgid2.pkg", ], - launchctl: [ - "com.eset.esets_daemon", - "com.eset.esets_pidmapper", - ], delete: [ "/Applications/ESET Cyber Security Pro.app", "/Library/Application Support/ESET", diff --git a/Casks/f/fig.rb b/Casks/f/fig.rb index 731bcfe6a6..4393ae66f7 100644 --- a/Casks/f/fig.rb +++ b/Casks/f/fig.rb @@ -20,11 +20,7 @@ cask "fig" do app "Fig.app" binary "#{appdir}/Fig.app/Contents/MacOS/fig-darwin-universal", target: "fig" - uninstall script: { - executable: "#{appdir}/Fig.app/Contents/MacOS/fig-darwin-universal", - args: ["_", "brew-uninstall"], - }, - launchctl: [ + uninstall launchctl: [ "io.fig.launcher", "io.fig.uninstall", "io.fig.dotfiles-daemon", @@ -32,7 +28,11 @@ cask "fig" do quit: [ "com.mschrage.fig", "io.fig.cursor", - ] + ], + script: { + executable: "#{appdir}/Fig.app/Contents/MacOS/fig-darwin-universal", + args: ["_", "brew-uninstall"], + } zap trash: [ "~/.fig", diff --git a/Casks/f/focusrite-control-2.rb b/Casks/f/focusrite-control-2.rb index 31fff45986..d52b9895b0 100644 --- a/Casks/f/focusrite-control-2.rb +++ b/Casks/f/focusrite-control-2.rb @@ -18,8 +18,8 @@ cask "focusrite-control-2" do app "Focusrite Control 2.app" - uninstall quit: "com.focusrite.control", - launchctl: "com.focusrite.ControlServer" + uninstall launchctl: "com.focusrite.ControlServer", + quit: "com.focusrite.control" zap trash: [ "~/Library/Application Support/Focusrite", diff --git a/Casks/f/focusrite-control.rb b/Casks/f/focusrite-control.rb index a83582f45a..6b0fa5366c 100644 --- a/Casks/f/focusrite-control.rb +++ b/Casks/f/focusrite-control.rb @@ -14,18 +14,18 @@ cask "focusrite-control" do pkg "Focusrite Control.pkg" - uninstall pkgutil: "com.focusrite.FocusriteControl", - launchctl: "com.focusrite.ControlServer" + uninstall launchctl: "com.focusrite.ControlServer", + pkgutil: "com.focusrite.FocusriteControl" - zap trash: [ + zap delete: [ + "/Library/Application Support/Focusrite", + "/Library/LaunchDaemons/com.focusrite.ControlServer.plist", + "/Library/Logs/Focusrite Control", + ], + trash: [ "~/Library/Application Support/Focusrite", "~/Library/Caches/com.juce.locks", "~/Library/Logs/Focusrite Control", "~/Library/Saved Application State/com.focusrite.FocusriteControl.savedState", - ], - delete: [ - "/Library/Application Support/Focusrite", - "/Library/LaunchDaemons/com.focusrite.ControlServer.plist", - "/Library/Logs/Focusrite Control", ] end diff --git a/Casks/f/folding-at-home.rb b/Casks/f/folding-at-home.rb index 818e7e5a8e..33a20e67b0 100644 --- a/Casks/f/folding-at-home.rb +++ b/Casks/f/folding-at-home.rb @@ -16,12 +16,12 @@ cask "folding-at-home" do pkg "fah-installer_#{version}_x86_64-b.pkg" - uninstall pkgutil: "org.foldingathome.*", - launchctl: "org.foldingathome.fahclient", + uninstall launchctl: "org.foldingathome.fahclient", quit: [ "org.foldingathome.fahcontrol", "org.foldingathome.fahviewer", - ] + ], + pkgutil: "org.foldingathome.*" zap trash: "/Library/Application Support/FAHClient" end diff --git a/Casks/f/forklift.rb b/Casks/f/forklift.rb index f627166e01..ec2c4901af 100644 --- a/Casks/f/forklift.rb +++ b/Casks/f/forklift.rb @@ -18,15 +18,15 @@ cask "forklift" do app "ForkLift.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.binarynights.ForkLiftHelper", - launchctl: [ + uninstall launchctl: [ "com.binarynights.ForkLiftHelper", "com.binarynights.ForkLiftMini", ], quit: [ "com.binarynights.ForkLift-#{version.major}", "com.binarynights.ForkLiftMini", - ] + ], + delete: "/Library/PrivilegedHelperTools/com.binarynights.ForkLiftHelper" zap trash: [ "~/Library/Application Support/ForkLift", diff --git a/Casks/f/foxit-pdf-editor.rb b/Casks/f/foxit-pdf-editor.rb index 8b51354fc0..8eba17e35b 100644 --- a/Casks/f/foxit-pdf-editor.rb +++ b/Casks/f/foxit-pdf-editor.rb @@ -22,13 +22,13 @@ cask "foxit-pdf-editor" do pkg "FoxitPDFEditor#{version.no_dots}.L10N.Setup.pkg" - uninstall pkgutil: "com.foxit.pkg.pdfeditor", + uninstall launchctl: "com.foxit.PDFEditorUpdateService", + pkgutil: "com.foxit.pkg.pdfeditor", delete: [ "/Applications/Foxit PDF Editor.app", "/Library/Application Support/Foxit Software/FoxitService/FoxitPDFEditorUpdateService.app", "/Library/LaunchDaemons/com.foxit.PDFEditorUpdateService.plist", - ], - launchctl: "com.foxit.PDFEditorUpdateService" + ] zap trash: [ "~/Library/Application Support/Foxit Software/Foxit PDF Editor", diff --git a/Casks/f/foxitreader.rb b/Casks/f/foxitreader.rb index 822ea78671..c0cbe5362b 100644 --- a/Casks/f/foxitreader.rb +++ b/Casks/f/foxitreader.rb @@ -20,9 +20,9 @@ cask "foxitreader" do pkg "FoxitPDFReader#{version.no_dots}.L10N.Setup.pkg" - uninstall pkgutil: "com.foxit.pkg.pdfreader", - delete: "/Applications/Foxit PDF Reader.app", - launchctl: "com.foxit.PDFReaderUpdateService" + uninstall launchctl: "com.foxit.PDFReaderUpdateService", + pkgutil: "com.foxit.pkg.pdfreader", + delete: "/Applications/Foxit PDF Reader.app" zap trash: [ "~/Library/Application Support/Foxit Software/Addon/Foxit PDF Reader", diff --git a/Casks/f/freedom.rb b/Casks/f/freedom.rb index 255fe0c365..d98f5fc3c5 100644 --- a/Casks/f/freedom.rb +++ b/Casks/f/freedom.rb @@ -17,8 +17,8 @@ cask "freedom" do app "Freedom.app" - uninstall quit: "com.80pct.FreedomPlatform", - launchctl: "com.80pct.FreedomHelper", + uninstall launchctl: "com.80pct.FreedomHelper", + quit: "com.80pct.FreedomPlatform", delete: [ "/Library/PrivilegedHelperTools/com.80pct.FreedomHelper", "/var/log/FreedomHelper.log", diff --git a/Casks/f/freedome.rb b/Casks/f/freedome.rb index 6d312250e4..4b3f0d5e57 100644 --- a/Casks/f/freedome.rb +++ b/Casks/f/freedome.rb @@ -14,9 +14,7 @@ cask "freedome" do pkg "Freedome.pkg" - uninstall quit: "com.fsecure.freedome.osx", - pkgutil: "com.f-secure.freedome*", - launchctl: [ + uninstall launchctl: [ "com.f-secure.freedome.gui", "com.f-secure.freedome.uninstall", "com.f-secure.fsvpn-ike-agent.production.macos", @@ -24,7 +22,9 @@ cask "freedome" do "com.f-secure.fsvpn-service.production", "com.f-secure.fsvpn-upstream.production", "fsvpn-ike-agent.production.macos", - ] + ], + quit: "com.fsecure.freedome.osx", + pkgutil: "com.f-secure.freedome*" zap trash: [ "/Library/LaunchDaemons/com.f-secure.freedome.uninstall.plist", diff --git a/Casks/f/fsmonitor.rb b/Casks/f/fsmonitor.rb index f80a486e85..500a499925 100644 --- a/Casks/f/fsmonitor.rb +++ b/Casks/f/fsmonitor.rb @@ -16,8 +16,8 @@ cask "fsmonitor" do app "FSMonitor.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.tristan.fseventstool", - launchctl: "com.tristan.fseventstool" + uninstall launchctl: "com.tristan.fseventstool", + delete: "/Library/PrivilegedHelperTools/com.tristan.fseventstool" zap trash: [ "/Users/Shared/FSMonitor", diff --git a/Casks/f/ftdi-vcp-driver.rb b/Casks/f/ftdi-vcp-driver.rb index 5d7334fc8b..7c8caec0ff 100644 --- a/Casks/f/ftdi-vcp-driver.rb +++ b/Casks/f/ftdi-vcp-driver.rb @@ -7,11 +7,11 @@ cask "ftdi-vcp-driver" do pkg "FTDIUSBSerial.pkg" - uninstall pkgutil: [ + uninstall kext: "com.FTDI.driver.FTDIUSBSerialDriver", + pkgutil: [ "com.FTDI.ftdiusbserialdriverinstaller.*", "com.FTDI.driver.FTDIUSBSerialDriver", ], - kext: "com.FTDI.driver.FTDIUSBSerialDriver", delete: "/Library/Extensions/FTDIUSBSerialDriver.kext" caveats do diff --git a/Casks/f/fujitsu-scansnap-home.rb b/Casks/f/fujitsu-scansnap-home.rb index c83f1c46d1..0cd3e140f9 100644 --- a/Casks/f/fujitsu-scansnap-home.rb +++ b/Casks/f/fujitsu-scansnap-home.rb @@ -33,13 +33,13 @@ cask "fujitsu-scansnap-home" do ], pkgutil: "com.fujitsu.pfu.scansnap.Home.*" - zap trash: [ + zap delete: "/Library/Application Support/PFU", + trash: [ "~/Library/Application Support/PFU", "~/Library/Caches/jp.co.pfu.SSHomeWizard", "~/Library/HTTPStorages/jp.co.pfu.SSHomeWizard", "~/Library/Preferences/com.fujitsu.pfu.*", "~/Library/Saved Application State/com.fujitsu.pfu.ScanSnapHome.savedState", "~/Library/Saved Application State/jp.co.pfu.SSHomeWizard.savedState", - ], - delete: "/Library/Application Support/PFU" + ] end diff --git a/Casks/f/fxfactory.rb b/Casks/f/fxfactory.rb index 730751f30e..ea47a10c0e 100644 --- a/Casks/f/fxfactory.rb +++ b/Casks/f/fxfactory.rb @@ -23,9 +23,9 @@ cask "fxfactory" do pkg "Install FxFactory #{version.csv.first}.pkg" - uninstall pkgutil: "com.fxfactory.pkg", + uninstall launchctl: "com.fxfactory.FxFactory.helper", quit: "com.fxfactory.FxFactory", - launchctl: "com.fxfactory.FxFactory.helper", + pkgutil: "com.fxfactory.pkg", delete: [ "/Library/Application Support/FxFactory", "/Library/LaunchDaemons/com.fxfactory.FxFactory.helper.plist", diff --git a/Casks/g/gamemaker.rb b/Casks/g/gamemaker.rb index 053724d887..eefb500204 100644 --- a/Casks/g/gamemaker.rb +++ b/Casks/g/gamemaker.rb @@ -29,8 +29,8 @@ cask "gamemaker" do opoo "Unable to forcibly close GameMaker.app" end - uninstall delete: "/Applications/GameMaker.app", - pkgutil: "com.yoyogames.gms2" + uninstall pkgutil: "com.yoyogames.gms2", + delete: "/Applications/GameMaker.app" zap trash: "/Users/Shared/GameMakerStudio2" end diff --git a/Casks/g/glimmerblocker.rb b/Casks/g/glimmerblocker.rb index 82e911ed4f..5e1dbde4ef 100644 --- a/Casks/g/glimmerblocker.rb +++ b/Casks/g/glimmerblocker.rb @@ -11,12 +11,12 @@ cask "glimmerblocker" do pkg "GlimmerBlocker.pkg" - uninstall pkgutil: "org.glimmerblocker.pkg", - launchctl: [ + uninstall launchctl: [ "org.glimmerblocker.installer", "org.glimmerblocker.proxy", "org.glimmerblocker.updater", ], + pkgutil: "org.glimmerblocker.pkg", delete: "/Library/PreferencePanes/GlimmerBlocker.prefPane" zap trash: [ diff --git a/Casks/g/gog-galaxy.rb b/Casks/g/gog-galaxy.rb index c43d2cb93e..0224d35fdd 100644 --- a/Casks/g/gog-galaxy.rb +++ b/Casks/g/gog-galaxy.rb @@ -16,12 +16,12 @@ cask "gog-galaxy" do pkg "galaxy_client_#{version}.pkg" - uninstall delete: "/Applications/GOG Galaxy.app", - launchctl: [ + uninstall launchctl: [ "com.gog.galaxy.autoLauncher", "com.gog.galaxy.ClientService", "com.gog.galaxy.commservice", - ] + ], + delete: "/Applications/GOG Galaxy.app" zap trash: [ "/Library/LaunchDaemons/com.gog.galaxy.ClientService.plist", diff --git a/Casks/g/google-chrome.rb b/Casks/g/google-chrome.rb index da42aff2ec..94c3d2541c 100644 --- a/Casks/g/google-chrome.rb +++ b/Casks/g/google-chrome.rb @@ -19,7 +19,11 @@ cask "google-chrome" do app "Google Chrome.app" - zap trash: [ + zap launchctl: [ + "com.google.keystone.agent", + "com.google.keystone.daemon", + ], + trash: [ "/Library/Caches/com.google.SoftwareUpdate.*", "/Library/Google/Google Chrome Brand.plist", "/Library/Google/GoogleSoftwareUpdate", @@ -48,9 +52,5 @@ cask "google-chrome" do "~/Library/Application Support/Google", "~/Library/Caches/Google", "~/Library/Google", - ], - launchctl: [ - "com.google.keystone.agent", - "com.google.keystone.daemon", ] end diff --git a/Casks/g/google-earth-pro.rb b/Casks/g/google-earth-pro.rb index c85ad71fa8..9f967d2562 100644 --- a/Casks/g/google-earth-pro.rb +++ b/Casks/g/google-earth-pro.rb @@ -20,19 +20,19 @@ cask "google-earth-pro" do # pkgutil: com.google.pkg.Keystone uninstall pkgutil: "com.Google.GoogleEarthPro" - zap trash: [ - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.googleearthpro.sfl*", - "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.googleearthupdatehelper.sfl*", - "~/Library/Application Support/Google Earth", - "~/Library/Caches/Google Earth", - "~/Library/Caches/com.Google.GoogleEarthPro", - ], - launchctl: [ + zap launchctl: [ "com.google.keystone.agent", "com.google.keystone.system.agent", "com.google.keystone.daemon", "com.google.keystone.xpcservice", "com.google.keystone.system.xpcservice", ], - pkgutil: "com.google.pkg.Keystone" + pkgutil: "com.google.pkg.Keystone", + trash: [ + "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.googleearthpro.sfl*", + "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.google.googleearthupdatehelper.sfl*", + "~/Library/Application Support/Google Earth", + "~/Library/Caches/Google Earth", + "~/Library/Caches/com.Google.GoogleEarthPro", + ] end diff --git a/Casks/g/google-japanese-ime.rb b/Casks/g/google-japanese-ime.rb index c60b1e8531..5b298d437b 100644 --- a/Casks/g/google-japanese-ime.rb +++ b/Casks/g/google-japanese-ime.rb @@ -21,18 +21,18 @@ cask "google-japanese-ime" do # See: https://github.com/Homebrew/homebrew-cask/pull/92704#issuecomment-727163169 # launchctl: com.google.keystone.daemon, com.google.keystone.system.agent, com.google.keystone.system.xpcservice # pkgutil: com.google.pkg.Keystone - uninstall pkgutil: "com.google.pkg.GoogleJapaneseInput", - launchctl: [ + uninstall launchctl: [ "com.google.inputmethod.Japanese.Converter", "com.google.inputmethod.Japanese.Renderer", - ] + ], + pkgutil: "com.google.pkg.GoogleJapaneseInput" - zap pkgutil: "com.google.pkg.Keystone", - launchctl: [ + zap launchctl: [ "com.google.keystone.agent", "com.google.keystone.daemon", "com.google.keystone.xpcservice", ], + pkgutil: "com.google.pkg.Keystone", trash: [ "~/Library/Application Support/Google/JapaneseInput", "~/Library/Logs/GoogleJapaneseInput", diff --git a/Casks/g/google-web-designer.rb b/Casks/g/google-web-designer.rb index 22349a70a7..530a352e95 100644 --- a/Casks/g/google-web-designer.rb +++ b/Casks/g/google-web-designer.rb @@ -14,12 +14,12 @@ cask "google-web-designer" do app "Google Web Designer.app" - zap rmdir: "~/Library/Google", - trash: [ + zap trash: [ "~/Documents/Google Web Designer", "~/Library/Application Support/Google/Web Designer", "~/Library/Google/GoogleSoftwareUpdate/Actives/com.google.WebDesigner", "~/Library/Preferences/com.google.WebDesigner.plist", "~/Library/Saved Application State/com.google.WebDesigner.savedState", - ] + ], + rmdir: "~/Library/Google" end diff --git a/Casks/g/gpg-suite-no-mail.rb b/Casks/g/gpg-suite-no-mail.rb index d6c2bf84ac..a809d3438e 100644 --- a/Casks/g/gpg-suite-no-mail.rb +++ b/Casks/g/gpg-suite-no-mail.rb @@ -124,20 +124,7 @@ cask "gpg-suite-no-mail" do end end - uninstall script: { - executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", - sudo: true, - }, - pkgutil: "org.gpgtools.*", - quit: [ - "com.apple.mail", - "org.gpgtools.gpgkeychain", - "org.gpgtools.gpgkeychainaccess", - "org.gpgtools.gpgmail.upgrader", - "org.gpgtools.gpgservices", - # TODO: add "killall -kill gpg-agent" - ], - launchctl: [ + uninstall launchctl: [ "org.gpgtools.gpgmail.enable-bundles", "org.gpgtools.gpgmail.patch-uuid-user", "org.gpgtools.gpgmail.user-uuid-patcher", @@ -149,6 +136,19 @@ cask "gpg-suite-no-mail" do "org.gpgtools.macgpg2.updater", "org.gpgtools.updater", ], + quit: [ + "com.apple.mail", + "org.gpgtools.gpgkeychain", + "org.gpgtools.gpgkeychainaccess", + "org.gpgtools.gpgmail.upgrader", + "org.gpgtools.gpgservices", + # TODO: add "killall -kill gpg-agent" + ], + script: { + executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", + sudo: true, + }, + pkgutil: "org.gpgtools.*", delete: [ "/Library/Application Support/GPGTools", "/Library/Frameworks/Libmacgpg.framework", diff --git a/Casks/g/gpg-suite-pinentry.rb b/Casks/g/gpg-suite-pinentry.rb index ed0e46d04a..a33fd0facb 100644 --- a/Casks/g/gpg-suite-pinentry.rb +++ b/Casks/g/gpg-suite-pinentry.rb @@ -124,20 +124,7 @@ cask "gpg-suite-pinentry" do end end - uninstall script: { - executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", - sudo: true, - }, - pkgutil: "org.gpgtools.*", - quit: [ - "com.apple.mail", - "org.gpgtools.gpgkeychain", - "org.gpgtools.gpgkeychainaccess", - "org.gpgtools.gpgmail.upgrader", - "org.gpgtools.gpgservices", - # TODO: add "killall -kill gpg-agent" - ], - launchctl: [ + uninstall launchctl: [ "org.gpgtools.gpgmail.enable-bundles", "org.gpgtools.gpgmail.patch-uuid-user", "org.gpgtools.gpgmail.user-uuid-patcher", @@ -149,6 +136,19 @@ cask "gpg-suite-pinentry" do "org.gpgtools.macgpg2.updater", "org.gpgtools.updater", ], + quit: [ + "com.apple.mail", + "org.gpgtools.gpgkeychain", + "org.gpgtools.gpgkeychainaccess", + "org.gpgtools.gpgmail.upgrader", + "org.gpgtools.gpgservices", + # TODO: add "killall -kill gpg-agent" + ], + script: { + executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", + sudo: true, + }, + pkgutil: "org.gpgtools.*", delete: [ "/Library/Application Support/GPGTools", "/Library/Frameworks/Libmacgpg.framework", diff --git a/Casks/g/gpg-suite.rb b/Casks/g/gpg-suite.rb index 8f8e38842f..d08daaa15b 100644 --- a/Casks/g/gpg-suite.rb +++ b/Casks/g/gpg-suite.rb @@ -28,20 +28,7 @@ cask "gpg-suite" do end end - uninstall script: { - executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", - sudo: true, - }, - pkgutil: "org.gpgtools.*", - quit: [ - "com.apple.mail", - "org.gpgtools.gpgkeychain", - "org.gpgtools.gpgkeychainaccess", - "org.gpgtools.gpgmail.upgrader", - "org.gpgtools.gpgservices", - # TODO: add "killall -kill gpg-agent" - ], - launchctl: [ + uninstall launchctl: [ "org.gpgtools.gpgmail.enable-bundles", "org.gpgtools.gpgmail.patch-uuid-user", "org.gpgtools.gpgmail.user-uuid-patcher", @@ -53,6 +40,19 @@ cask "gpg-suite" do "org.gpgtools.macgpg2.updater", "org.gpgtools.updater", ], + quit: [ + "com.apple.mail", + "org.gpgtools.gpgkeychain", + "org.gpgtools.gpgkeychainaccess", + "org.gpgtools.gpgmail.upgrader", + "org.gpgtools.gpgservices", + # TODO: add "killall -kill gpg-agent" + ], + script: { + executable: "#{staged_path}/Uninstall.app/Contents/Resources/GPG Suite Uninstaller.app/Contents/Resources/uninstall.sh", + sudo: true, + }, + pkgutil: "org.gpgtools.*", delete: [ "/Library/Application Support/GPGTools", "/Library/Frameworks/Libmacgpg.framework", diff --git a/Casks/g/gpg-sync.rb b/Casks/g/gpg-sync.rb index 92cc311d41..a031981432 100644 --- a/Casks/g/gpg-sync.rb +++ b/Casks/g/gpg-sync.rb @@ -10,6 +10,6 @@ cask "gpg-sync" do pkg "GPGSync-#{version}.pkg" - uninstall pkgutil: "org.firstlook.gpgsync", - launchctl: "org.firstlook.gpgsync" + uninstall launchctl: "org.firstlook.gpgsync", + pkgutil: "org.firstlook.gpgsync" end diff --git a/Casks/g/grid.rb b/Casks/g/grid.rb index 5d6007988c..36a66cd7e4 100644 --- a/Casks/g/grid.rb +++ b/Casks/g/grid.rb @@ -14,11 +14,11 @@ cask "grid" do app "Grid.app" - uninstall quit: [ + uninstall launchctl: "app.macgrid.GridLaunchAtLogin", + quit: [ "app.macgrid.Grid", "app.macgrid.GridLaunchAtLogin", - ], - launchctl: "app.macgrid.GridLaunchAtLogin" + ] zap trash: [ "~/Library/Application Support/Grid", diff --git a/Casks/g/gyazo.rb b/Casks/g/gyazo.rb index 045aca25ae..40e2f6fdfc 100644 --- a/Casks/g/gyazo.rb +++ b/Casks/g/gyazo.rb @@ -15,8 +15,8 @@ cask "gyazo" do pkg "Gyazo-#{version}.pkg" uninstall launchctl: "com.gyazo.menu.helper", - pkgutil: "com.gyazo.pkg", - quit: "com.gyazo.menu" + quit: "com.gyazo.menu", + pkgutil: "com.gyazo.pkg" zap trash: [ "~/Library/Caches/com.gyazo.gif", diff --git a/Casks/h/heimdall-suite.rb b/Casks/h/heimdall-suite.rb index 2162325875..86815035ee 100644 --- a/Casks/h/heimdall-suite.rb +++ b/Casks/h/heimdall-suite.rb @@ -15,8 +15,8 @@ cask "heimdall-suite" do pkg "Heimdall Suite #{version}.pkg" - uninstall pkgutil: "au.com.glassechidna.HeimdallSuite", - kext: "au.com.glassechidna.heimdall_usb_shield", + uninstall kext: "au.com.glassechidna.heimdall_usb_shield", + pkgutil: "au.com.glassechidna.HeimdallSuite", delete: "/Applications/heimdall-frontend.app" zap trash: [ diff --git a/Casks/h/herd.rb b/Casks/h/herd.rb index 32a4a98754..ea4c92d450 100644 --- a/Casks/h/herd.rb +++ b/Casks/h/herd.rb @@ -17,8 +17,8 @@ cask "herd" do app "Herd.app" - uninstall delete: "/etc/sudoers.d/herd", - quit: "Herd.app" + uninstall quit: "Herd.app", + delete: "/etc/sudoers.d/herd" zap trash: [ "~/Herd", diff --git a/Casks/h/hhkb.rb b/Casks/h/hhkb.rb index b2370e53ca..3f72455353 100644 --- a/Casks/h/hhkb.rb +++ b/Casks/h/hhkb.rb @@ -17,8 +17,8 @@ cask "hhkb" do pkg "HHKBkeymapTool_#{version.no_dots}ma.pkg" - uninstall pkgutil: "jp.co.pfu.hhkb-keymap-tool.pkg.V#{version}", - quit: "jp.co.pfu.hhkb-keymap-tool", + uninstall quit: "jp.co.pfu.hhkb-keymap-tool", + pkgutil: "jp.co.pfu.hhkb-keymap-tool.pkg.V#{version}", delete: [ "/Applications/hhkb-keymap-tool*", "/Applications/HHKB/EULA_*.rtf", diff --git a/Casks/h/hiddenbar.rb b/Casks/h/hiddenbar.rb index 18df44107b..7b23d8ac45 100644 --- a/Casks/h/hiddenbar.rb +++ b/Casks/h/hiddenbar.rb @@ -16,8 +16,8 @@ cask "hiddenbar" do app "Hidden Bar.app" - uninstall quit: "com.dwarvesv.minimalbar", - launchctl: "com.dwarvesv.LauncherApplication" + uninstall launchctl: "com.dwarvesv.LauncherApplication", + quit: "com.dwarvesv.minimalbar" zap trash: [ "~/Library/Application Scripts/com.dwarvesv.LauncherApplication", diff --git a/Casks/h/hidock.rb b/Casks/h/hidock.rb index 5af24ff0ab..6386deb8a8 100644 --- a/Casks/h/hidock.rb +++ b/Casks/h/hidock.rb @@ -17,11 +17,11 @@ cask "hidock" do app "HiDock.app" - uninstall login_item: "HiDock", - quit: [ + uninstall quit: [ "design.rafa.HiDock", "design.rafa.HiDock-LaunchAtLoginHelper", - ] + ], + login_item: "HiDock" zap trash: [ "~/Library/HTTPStorages/design.rafa.HiDock", diff --git a/Casks/h/hwsensors.rb b/Casks/h/hwsensors.rb index d8ba4654fb..366ff8a1b2 100644 --- a/Casks/h/hwsensors.rb +++ b/Casks/h/hwsensors.rb @@ -11,9 +11,9 @@ cask "hwsensors" do pkg "HWSensors.#{version}.pkg" - uninstall login_item: "HWMonitor", - pkgutil: "org.hwsensors.HWMonitor", - quit: "org.hwsensors.HWMonitor" + uninstall quit: "org.hwsensors.HWMonitor", + login_item: "HWMonitor", + pkgutil: "org.hwsensors.HWMonitor" zap trash: [ "~/Library/Application Support/HWMonitor", diff --git a/Casks/i/i1profiler.rb b/Casks/i/i1profiler.rb index c2c4154f73..7845895e5c 100644 --- a/Casks/i/i1profiler.rb +++ b/Casks/i/i1profiler.rb @@ -16,15 +16,15 @@ cask "i1profiler" do pkg "i1Profiler.pkg" - uninstall pkgutil: [ + uninstall launchctl: [ + "com.aladdin.aksusbd", + "com.aladdin.hasplmd", + ], + pkgutil: [ "com.xrite.hasp.installer.*", "com.xrite.i1profiler.*", "com.xrite.xritedeviceservices.*", ], - launchctl: [ - "com.aladdin.aksusbd", - "com.aladdin.hasplmd", - ], delete: [ "/Applications/i1Profiler/i1Profiler.app", "/Library/Application Support/X-Rite", diff --git a/Casks/i/iceberg.rb b/Casks/i/iceberg.rb index 6e3629159a..af3533de1f 100644 --- a/Casks/i/iceberg.rb +++ b/Casks/i/iceberg.rb @@ -14,14 +14,14 @@ cask "iceberg" do pkg "Iceberg.mpkg" - uninstall pkgutil: [ - "fr.white.iceberg.pkg.*", - "fr.whitebox.pkg.*", - ], - script: { + uninstall script: { executable: "uninstall.sh", sudo: true, - } + }, + pkgutil: [ + "fr.white.iceberg.pkg.*", + "fr.whitebox.pkg.*", + ] zap trash: "/Library/Application Support/Iceberg" end diff --git a/Casks/i/iconchamp.rb b/Casks/i/iconchamp.rb index fd62427772..d69125a29b 100644 --- a/Casks/i/iconchamp.rb +++ b/Casks/i/iconchamp.rb @@ -17,8 +17,8 @@ cask "iconchamp" do app "IconChamp.app" - uninstall quit: "com.macenhance.IconChamp", - launchctl: "com.macenhance.ICHelper", + uninstall launchctl: "com.macenhance.ICHelper", + quit: "com.macenhance.IconChamp", delete: [ "/Library/LaunchDaemons/com.macenhance.ICHelper.plist", "/Library/PrivilegedHelperTools/com.macenhance.ICHelper", diff --git a/Casks/i/idrive.rb b/Casks/i/idrive.rb index d9a5a3a2e9..4a8b6bee6b 100644 --- a/Casks/i/idrive.rb +++ b/Casks/i/idrive.rb @@ -19,13 +19,13 @@ cask "idrive" do "IDWifiManager", "IDriveDaemon", ], - pkgutil: "com.profsoftnet.idrive.*", quit: [ "com.prosfotnet.IDWifiManager", "com.prosoftnet.IDrive", "com.prosoftnet.IDriveDaemon", "com.prosoftnet.IDriveMonitor", - ] + ], + pkgutil: "com.profsoftnet.idrive.*" zap trash: [ "/Library/Application Support/IDriveforMac", diff --git a/Casks/i/ilok-license-manager.rb b/Casks/i/ilok-license-manager.rb index ffcbb4cc1b..ccf2356a5e 100644 --- a/Casks/i/ilok-license-manager.rb +++ b/Casks/i/ilok-license-manager.rb @@ -18,26 +18,26 @@ cask "ilok-license-manager" do pkg "License Support.pkg" - uninstall pkgutil: [ + uninstall launchctl: [ + "com.paceap.eden.licensed", + "com.paceap.eden.licensed.agent", + ], + pkgutil: [ "com.paceap.pkg.eden.iLokLicenseManager", "com.paceap.pkg.eden.licensed", "com.paceap.pkg.eden.activationexperience", ], - launchctl: [ - "com.paceap.eden.licensed", - "com.paceap.eden.licensed.agent", - ], delete: "/usr/local/bin/iloktool" - zap trash: [ + zap delete: [ + "/Library/Preferences/com.paceap.eden.clientdb.*.sdb", + "/Library/Preferences/com.paceap.eden.floating.*.prefs", + ], + trash: [ "~/Library/Caches/com.paceap.iLokLicenseManager", "~/Library/Logs/Eden", "~/Library/HTTPStorages/com.paceap.eden.iLokLicenseManager", "~/Library/Preferences/com.paceap.iLokLicenseManager.plist", "~/Library/Saved Application State/com.paceap.eden.iLokLicenseManager.savedState", - ], - delete: [ - "/Library/Preferences/com.paceap.eden.clientdb.*.sdb", - "/Library/Preferences/com.paceap.eden.floating.*.prefs", ] end diff --git a/Casks/i/imazing.rb b/Casks/i/imazing.rb index 59f71daf23..133652f236 100644 --- a/Casks/i/imazing.rb +++ b/Casks/i/imazing.rb @@ -16,11 +16,11 @@ cask "imazing" do app "iMazing.app" - uninstall login_item: "iMazing Mini", - quit: [ + uninstall quit: [ "com.DigiDNA.iMazing#{version.csv.first}.#{version.csv.second}Mac", "com.DigiDNA.iMazing#{version.csv.first}.#{version.csv.second}Mac.Mini", - ] + ], + login_item: "iMazing Mini" zap trash: [ "~/Library/Application Support/iMazing", diff --git a/Casks/i/insta360-studio.rb b/Casks/i/insta360-studio.rb index 8e7a960f9f..7d89bd9d34 100644 --- a/Casks/i/insta360-studio.rb +++ b/Casks/i/insta360-studio.rb @@ -36,12 +36,12 @@ cask "insta360-studio" do pkg "Insta360Studio#{version.csv.second}_#{version.csv.first}_#{version.csv.fourth}.pkg" uninstall quit: "com.insta360.studio", - delete: "/Applications/Insta360 Studio #{version.csv.third.split("_")[0]}.app", pkgutil: [ "com.insta360.insta360Studio", "com.insta360.PremierePlugin", "com.insta360.ThumbnailPlugin", - ] + ], + delete: "/Applications/Insta360 Studio #{version.csv.third.split("_")[0]}.app" zap trash: [ "~/Library/Application Support/Insta360", diff --git a/Casks/i/intel-haxm.rb b/Casks/i/intel-haxm.rb index c575f420a5..f8064f9d5b 100644 --- a/Casks/i/intel-haxm.rb +++ b/Casks/i/intel-haxm.rb @@ -17,13 +17,13 @@ cask "intel-haxm" do sudo: true, } - uninstall pkgutil: "com.intel.kext.haxm.*", - script: { + uninstall script: { sudo: true, must_succeed: true, executable: "silent_install.sh", args: ["-u"], - } + }, + pkgutil: "com.intel.kext.haxm.*" caveats do kext diff --git a/Casks/i/iriunwebcam.rb b/Casks/i/iriunwebcam.rb index 9d00a7dd61..71500e247e 100644 --- a/Casks/i/iriunwebcam.rb +++ b/Casks/i/iriunwebcam.rb @@ -17,17 +17,17 @@ cask "iriunwebcam" do pkg "IriunWebcam-#{version}.pkg" - uninstall quit: [ - "com.iriun.macwebcam", - "com.iriun.webcam", - ], - pkgutil: "com.iriun.*", - launchctl: [ + uninstall launchctl: [ "com.iriun.cmio.DPA.camera", "com.iriun.cmio.DPA.camerb", "com.iriun.cmio.DPA.camerc", "com.iriun.cmio.DPA.camerd", - ] + ], + quit: [ + "com.iriun.macwebcam", + "com.iriun.webcam", + ], + pkgutil: "com.iriun.*" zap trash: "~/Library/Saved Application State/com.iriun.macwebcam.savedState" end diff --git a/Casks/i/istat-menus.rb b/Casks/i/istat-menus.rb index 837dc94fcf..bd175db649 100644 --- a/Casks/i/istat-menus.rb +++ b/Casks/i/istat-menus.rb @@ -17,13 +17,7 @@ cask "istat-menus" do app "iStat Menus.app" - uninstall delete: [ - "/Library/Application Support/iStat Menus #{version.major}", - "/Library/LaunchDaemons/com.bjango.istatmenus.fans.plist", - "/Library/Logs/iStat Menus", - "/Library/PrivilegedHelperTools/com.bjango.istatmenus.installerhelper", - ], - launchctl: [ + uninstall launchctl: [ "com.bjango.istatmenus.agent", "com.bjango.istatmenus.daemon", "com.bjango.istatmenusnotifications", @@ -36,6 +30,12 @@ cask "istat-menus" do ["TERM", "com.bjango.istatmenusstatus"], ["TERM", "com.bjango.istatmenus"], ["HUP", "com.bjango.istatmenus"], + ], + delete: [ + "/Library/Application Support/iStat Menus #{version.major}", + "/Library/LaunchDaemons/com.bjango.istatmenus.fans.plist", + "/Library/Logs/iStat Menus", + "/Library/PrivilegedHelperTools/com.bjango.istatmenus.installerhelper", ] zap trash: [ diff --git a/Casks/i/isyncr.rb b/Casks/i/isyncr.rb index 41e9132f24..f2216a95cf 100644 --- a/Casks/i/isyncr.rb +++ b/Casks/i/isyncr.rb @@ -28,6 +28,6 @@ cask "isyncr" do pkg "iSyncr Desktop #{version}.pkg" - uninstall pkgutil: "com.jrtstudio.iSyncrDesktop", - quit: "com.JRTStudio.iSyncrWiFi" + uninstall quit: "com.JRTStudio.iSyncrWiFi", + pkgutil: "com.jrtstudio.iSyncrDesktop" end diff --git a/Casks/i/itch.rb b/Casks/i/itch.rb index 823caff3ed..75aa2cb1d8 100644 --- a/Casks/i/itch.rb +++ b/Casks/i/itch.rb @@ -17,11 +17,11 @@ cask "itch" do installer script: "Install itch.app/Contents/MacOS/itch-setup" - uninstall delete: [ + uninstall quit: "io.itch.mac", + delete: [ "~/Applications/itch.app", "~/Library/Application Support/itch-setup/", - ], - quit: "io.itch.mac" + ] zap trash: [ "~/Library/Application Support/itch/", diff --git a/Casks/i/ivpn.rb b/Casks/i/ivpn.rb index 8a3c0f584b..ad37e83e0f 100644 --- a/Casks/i/ivpn.rb +++ b/Casks/i/ivpn.rb @@ -24,12 +24,12 @@ cask "ivpn" do set_ownership "#{appdir}/IVPN.app" end - uninstall delete: [ + uninstall launchctl: "net.ivpn.client.Helper", + quit: "net.ivpn.client.IVPN", + delete: [ "/Library/Application Support/IVPN", "/Library/PrivilegedHelperTools/net.ivpn.client.Helper", - ], - launchctl: "net.ivpn.client.Helper", - quit: "net.ivpn.client.IVPN" + ] zap trash: "~/Library/Preferences/net.ivpn.client.IVPN.plist" end diff --git a/Casks/j/jabra-direct.rb b/Casks/j/jabra-direct.rb index 364291e58d..d4021bafc6 100644 --- a/Casks/j/jabra-direct.rb +++ b/Casks/j/jabra-direct.rb @@ -25,13 +25,13 @@ cask "jabra-direct" do "com.jabra.softphoneService", "nl.superalloy.oss.terminal-notifier", ], - delete: "/Applications/Jabra Direct.app", login_item: "Jabra Direct", pkgutil: [ "com.jabra.directonline", "com.jabra.JabraFirmwareUpdate", "com.jabra.kext", - ] + ], + delete: "/Applications/Jabra Direct.app" zap trash: [ "~/Library/Application Support/Jabra", diff --git a/Casks/j/jedit-omega.rb b/Casks/j/jedit-omega.rb index af6de4b8b6..cd53174b42 100644 --- a/Casks/j/jedit-omega.rb +++ b/Casks/j/jedit-omega.rb @@ -21,8 +21,8 @@ cask "jedit-omega" do pkg "JeditOmega#{version.no_dots}.pkg" - uninstall pkgutil: "jp.co.artman21.JeditOmega", - quit: "jp.co.artman21.JeditOmega" + uninstall quit: "jp.co.artman21.JeditOmega", + pkgutil: "jp.co.artman21.JeditOmega" zap trash: [ "~/Library/Application Support/JeditOmega", diff --git a/Casks/j/jetbrains-toolbox.rb b/Casks/j/jetbrains-toolbox.rb index ef24faea32..1809b50cc3 100644 --- a/Casks/j/jetbrains-toolbox.rb +++ b/Casks/j/jetbrains-toolbox.rb @@ -24,8 +24,8 @@ cask "jetbrains-toolbox" do app "JetBrains Toolbox.app" - uninstall signal: ["TERM", "com.jetbrains.toolbox"], - launchctl: "com.jetbrains.toolbox" + uninstall launchctl: "com.jetbrains.toolbox", + signal: ["TERM", "com.jetbrains.toolbox"] zap trash: [ "~/Library/Application Support/JetBrains/Toolbox", diff --git a/Casks/j/jitouch.rb b/Casks/j/jitouch.rb index a078952d3a..522288709f 100644 --- a/Casks/j/jitouch.rb +++ b/Casks/j/jitouch.rb @@ -12,9 +12,9 @@ cask "jitouch" do pkg "Install-Jitouch.pkg" - uninstall quit: "com.jitouch.Jitouch", - pkgutil: "com.jitouch.Jitouch", - launchctl: "com.jitouch.Jitouch.agent" + uninstall launchctl: "com.jitouch.Jitouch.agent", + quit: "com.jitouch.Jitouch", + pkgutil: "com.jitouch.Jitouch" zap trash: [ "~/Library/LaunchAgents/com.jitouch.Jitouch.plist", diff --git a/Casks/j/jump-desktop-connect.rb b/Casks/j/jump-desktop-connect.rb index 4a5b801631..eee70f1401 100644 --- a/Casks/j/jump-desktop-connect.rb +++ b/Casks/j/jump-desktop-connect.rb @@ -14,13 +14,13 @@ cask "jump-desktop-connect" do pkg ".jdc.sparkle_guided.pkg" - uninstall signal: ["QUIT", "com.p5sys.jump.connect"], - pkgutil: "com.p5sys.jump.connect", - launchctl: [ + uninstall launchctl: [ "application.com.p5sys.jump.connect.*", "com.p5sys.jump.connect.service", "com.p5sys.jump.connect.agent", ], + signal: ["QUIT", "com.p5sys.jump.connect"], + pkgutil: "com.p5sys.jump.connect", delete: "/Library/Application Support/Jump Desktop/Connect/sharedconfig.plist", rmdir: [ "/Library/Application Support/Jump Desktop/Connect/", diff --git a/Casks/k/karabiner-elements.rb b/Casks/k/karabiner-elements.rb index f13bf1de72..25a222480c 100644 --- a/Casks/k/karabiner-elements.rb +++ b/Casks/k/karabiner-elements.rb @@ -41,22 +41,22 @@ cask "karabiner-elements" do pkg "Karabiner-Elements.sparkle_guided.pkg" end on_mojave :or_older do - uninstall signal: [ - ["TERM", "org.pqrs.Karabiner-Menu"], - ["TERM", "org.pqrs.Karabiner-NotificationWindow"], - ], - pkgutil: "org.pqrs.Karabiner-Elements", - launchctl: [ + uninstall launchctl: [ "org.pqrs.karabiner.agent.karabiner_grabber", "org.pqrs.karabiner.agent.karabiner_observer", "org.pqrs.karabiner.karabiner_console_user_server", "org.pqrs.karabiner.karabiner_kextd", "org.pqrs.karabiner.karabiner_session_monitor", ], + signal: [ + ["TERM", "org.pqrs.Karabiner-Menu"], + ["TERM", "org.pqrs.Karabiner-NotificationWindow"], + ], script: { executable: "/Library/Application Support/org.pqrs/Karabiner-Elements/uninstall_core.sh", sudo: true, }, + pkgutil: "org.pqrs.Karabiner-Elements", delete: "/Library/Application Support/org.pqrs/" end on_mojave do @@ -90,24 +90,24 @@ cask "karabiner-elements" do executable: "/Library/Application Support/org.pqrs/Karabiner-DriverKit-VirtualHIDDevice/scripts/uninstall/remove_files.sh", sudo: true, }, - signal: [ - ["TERM", "org.pqrs.Karabiner-Menu"], - ["TERM", "org.pqrs.Karabiner-NotificationWindow"], - ], - pkgutil: [ - "org.pqrs.Karabiner-DriverKit-VirtualHIDDevice", - "org.pqrs.Karabiner-Elements", - ], launchctl: [ "org.pqrs.karabiner.agent.karabiner_grabber", "org.pqrs.karabiner.agent.karabiner_observer", "org.pqrs.karabiner.karabiner_console_user_server", "org.pqrs.karabiner.karabiner_session_monitor", ], + signal: [ + ["TERM", "org.pqrs.Karabiner-Menu"], + ["TERM", "org.pqrs.Karabiner-NotificationWindow"], + ], script: { executable: "/Library/Application Support/org.pqrs/Karabiner-Elements/uninstall_core.sh", sudo: true, }, + pkgutil: [ + "org.pqrs.Karabiner-DriverKit-VirtualHIDDevice", + "org.pqrs.Karabiner-Elements", + ], delete: "/Library/Application Support/org.pqrs/" # The system extension 'org.pqrs.Karabiner-DriverKit-VirtualHIDDevice*' should not be uninstalled by Cask end diff --git a/Casks/k/kdrive.rb b/Casks/k/kdrive.rb index 95899bb9f8..0f316a800d 100644 --- a/Casks/k/kdrive.rb +++ b/Casks/k/kdrive.rb @@ -23,7 +23,8 @@ cask "kdrive" do system_command "/usr/bin/pkill", args: ["-f", "/Applications/kDrive/kDrive.app"] end - uninstall quit: [ + uninstall launchctl: "864VDCS2QY.com.infomaniak.drive.desktopclient.LoginItemAgent", + quit: [ "com.infomaniak.drive.desktopclient", "com.infomaniak.drive.desktopclient.Extension", ], @@ -32,7 +33,6 @@ cask "kdrive" do "com.infomaniak.drive.desktopclient.Extension", "com.infomaniak.drive.uninstaller", ], - launchctl: "864VDCS2QY.com.infomaniak.drive.desktopclient.LoginItemAgent", delete: "/Applications/kDrive/kDrive Uninstaller.app", rmdir: "/Applications/kDrive" diff --git a/Casks/k/keybase.rb b/Casks/k/keybase.rb index 4df3d1b57d..e86a965418 100644 --- a/Casks/k/keybase.rb +++ b/Casks/k/keybase.rb @@ -34,11 +34,7 @@ cask "keybase" do args: ["install-auto"] end - uninstall delete: [ - "/Library/Logs/keybase*", - "/Library/PrivilegedHelperTools/keybase.Helper", - ], - launchctl: "keybase.Helper", + uninstall launchctl: "keybase.Helper", signal: [ ["TERM", "keybase.Electron"], ["TERM", "keybase.ElectronHelper"], @@ -48,7 +44,11 @@ cask "keybase" do script: { executable: "#{appdir}/Keybase.app/Contents/SharedSupport/bin/keybase", args: ["uninstall"], - } + }, + delete: [ + "/Library/Logs/keybase*", + "/Library/PrivilegedHelperTools/keybase.Helper", + ] zap trash: [ "~/Library/Application Support/Keybase", diff --git a/Casks/k/kindle-comic-creator.rb b/Casks/k/kindle-comic-creator.rb index 9d00f6b756..3e3e0f0011 100644 --- a/Casks/k/kindle-comic-creator.rb +++ b/Casks/k/kindle-comic-creator.rb @@ -15,11 +15,11 @@ cask "kindle-comic-creator" do pkg "Kindle Comic Creator.pkg" - uninstall pkgutil: [ + uninstall launchctl: "com.amazon.KindlePreviewerUpdater", + pkgutil: [ "com.amazon.kc2.kindleComicCreator*", "com.amazon.kc2.KindlePreviewer.pkg", - ], - launchctl: "com.amazon.KindlePreviewerUpdater" + ] zap trash: [ "~/.kindle", diff --git a/Casks/k/klayout.rb b/Casks/k/klayout.rb index 8243c9bb38..aa93c17171 100644 --- a/Casks/k/klayout.rb +++ b/Casks/k/klayout.rb @@ -73,8 +73,8 @@ cask "klayout" do FileUtils.mv(staged_path.children, staged_path.join("KLayout").tap(&:mkpath)) end - uninstall pkgutil: "klayout.de", - quit: "klayout.de" + uninstall quit: "klayout.de", + pkgutil: "klayout.de" zap trash: "~/.klayout" end diff --git a/Casks/k/krisp.rb b/Casks/k/krisp.rb index 0fa75acbbe..dbbec06c9e 100644 --- a/Casks/k/krisp.rb +++ b/Casks/k/krisp.rb @@ -20,11 +20,11 @@ cask "krisp" do pkg "krisp_#{version}_#{arch}.pkg" - uninstall quit: "ai.krisp.krispMac", - launchctl: [ + uninstall launchctl: [ "ai.krisp.krispMac*", "krisp", ], + quit: "ai.krisp.krispMac", pkgutil: "ai.krisp.krispMac*", delete: "/Applications/krisp.app" diff --git a/Casks/l/lantern.rb b/Casks/l/lantern.rb index 5b76bebdf9..be2594fb27 100644 --- a/Casks/l/lantern.rb +++ b/Casks/l/lantern.rb @@ -20,8 +20,8 @@ cask "lantern" do app "Lantern.app" - uninstall quit: "com.getlantern.lantern", - launchctl: "org.getlantern" + uninstall launchctl: "org.getlantern", + quit: "com.getlantern.lantern" zap trash: [ "~/Library/Application Support/Lantern", diff --git a/Casks/l/launchcontrol.rb b/Casks/l/launchcontrol.rb index b5a1c17f6c..b493d22ad1 100644 --- a/Casks/l/launchcontrol.rb +++ b/Casks/l/launchcontrol.rb @@ -29,14 +29,14 @@ cask "launchcontrol" do app "LaunchControl.app" binary "#{appdir}/LaunchControl.app/Contents/MacOS/fdautil" - uninstall delete: "/Library/PrivilegedHelperTools/com.soma-zone.LaunchControl.Helper", - launchctl: "com.soma-zone.LaunchControl.Helper", + uninstall launchctl: "com.soma-zone.LaunchControl.Helper", quit: [ "com.soma-zone.JobWatch", "com.soma-zone.LaunchControl", "com.soma-zone.LicenseWindow", "com.soma-zone.QuickLaunch", - ] + ], + delete: "/Library/PrivilegedHelperTools/com.soma-zone.LaunchControl.Helper" zap trash: [ "~/Library/Application Support/LaunchControl", diff --git a/Casks/l/lehreroffice.rb b/Casks/l/lehreroffice.rb index 6822b8c442..77d6cacb29 100644 --- a/Casks/l/lehreroffice.rb +++ b/Casks/l/lehreroffice.rb @@ -14,9 +14,9 @@ cask "lehreroffice" do app "LehrerOffice.app" - zap trash: [ + zap delete: "/Library/Application Support/LehrerOffice", + trash: [ "~/Documents/LehrerOffice", "~/Library/Saved Application State/ch.rothsoft.lehreroffice.desktop.savedState", - ], - delete: "/Library/Application Support/LehrerOffice" + ] end diff --git a/Casks/l/letter-opener.rb b/Casks/l/letter-opener.rb index 4132d3de89..0a31432df7 100644 --- a/Casks/l/letter-opener.rb +++ b/Casks/l/letter-opener.rb @@ -17,12 +17,12 @@ cask "letter-opener" do pkg "Install Letter Opener.pkg" - uninstall pkgutil: [ - "pkg.app.letteropener.*", - "com.restoroot.Letter-Opener", - ], - launchctl: [ + uninstall launchctl: [ "app.letteropener.agent", "app.letteropener.softwareupdate.agent", + ], + pkgutil: [ + "pkg.app.letteropener.*", + "com.restoroot.Letter-Opener", ] end diff --git a/Casks/l/lg-onscreen-control.rb b/Casks/l/lg-onscreen-control.rb index 0b06ad05ac..9aa3a7e113 100644 --- a/Casks/l/lg-onscreen-control.rb +++ b/Casks/l/lg-onscreen-control.rb @@ -22,14 +22,14 @@ cask "lg-onscreen-control" do sudo: true end - uninstall login_item: [ - "OnScreen Control", - "OSCMultiMonitor", - ], - quit: [ + uninstall quit: [ "com.LGSI.OnScreen-Control", "com.LGSI.OSCMultiMonitor", ], + login_item: [ + "OnScreen Control", + "OSCMultiMonitor", + ], pkgutil: [ "com.lge.onscreenControl.*", "com.lge.OnscreenControl.*", diff --git a/Casks/l/lightkey.rb b/Casks/l/lightkey.rb index 1a9303f0a3..b63de48750 100644 --- a/Casks/l/lightkey.rb +++ b/Casks/l/lightkey.rb @@ -49,12 +49,12 @@ cask "lightkey" do pkg "LightkeyInstaller.pkg" - uninstall delete: "/Applications/Lightkey.app", - pkgutil: [ + uninstall pkgutil: [ "de.monospc.lightkey.pkg.App", "de.monospc.lightkey.pkg.documentation", "de.monospc.lightkey.pkg.OLA", - ] + ], + delete: "/Applications/Lightkey.app" zap trash: [ "~/Library/Application Support/Lightkey", diff --git a/Casks/l/linkliar.rb b/Casks/l/linkliar.rb index 0ea6624d28..c2664a6e7c 100644 --- a/Casks/l/linkliar.rb +++ b/Casks/l/linkliar.rb @@ -20,13 +20,13 @@ cask "linkliar" do app "LinkLiar.app" - uninstall delete: [ - "/Library/Application Support/io.github.halo.linkdaemon", - "/Library/Application Support/LinkLiar", - ], - launchctl: [ + uninstall launchctl: [ "io.github.halo.linkdaemon", "io.github.halo.linkhelper", ], - quit: "io.github.halo.LinkLiar" + quit: "io.github.halo.LinkLiar", + delete: [ + "/Library/Application Support/io.github.halo.linkdaemon", + "/Library/Application Support/LinkLiar", + ] end diff --git a/Casks/l/liteicon.rb b/Casks/l/liteicon.rb index 595d4f3f36..c5f325457c 100644 --- a/Casks/l/liteicon.rb +++ b/Casks/l/liteicon.rb @@ -26,12 +26,12 @@ cask "liteicon" do app "LiteIcon.app" - uninstall quit: "net.freemacsoft.LiteIcon", + uninstall launchctl: "net.freemacsoft.LiteIcon.LIHelperTool", + quit: "net.freemacsoft.LiteIcon", delete: [ "/Library/PrivilegedHelperTools/net.freemacsoft.LiteIcon.LIHelperTool", "~/Library/Application Support/LiteIcon", - ], - launchctl: "net.freemacsoft.LiteIcon.LIHelperTool" + ] zap trash: [ "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/net.freemacsoft.liteicon.sfl*", diff --git a/Casks/l/logdna-agent.rb b/Casks/l/logdna-agent.rb index 77f5d5fa38..2ff27dcdac 100644 --- a/Casks/l/logdna-agent.rb +++ b/Casks/l/logdna-agent.rb @@ -12,8 +12,8 @@ cask "logdna-agent" do pkg "logdna-agent-#{version}.pkg" - uninstall pkgutil: "com.logdna.logdna-agent", - launchctl: "com.logdna.logdna-agentd" + uninstall launchctl: "com.logdna.logdna-agentd", + pkgutil: "com.logdna.logdna-agent" caveats do <<~EOS diff --git a/Casks/l/loginputmac.rb b/Casks/l/loginputmac.rb index 4eb0291848..2167cb2fee 100644 --- a/Casks/l/loginputmac.rb +++ b/Casks/l/loginputmac.rb @@ -18,8 +18,8 @@ cask "loginputmac" do pkg "落格输入法 macOS #{version.major}.pkg" - uninstall pkgutil: "com.logcg.pkg.LoginputMac#{version.major}", - quit: "com.logcg.inputmethod.LogInputMac#{version.major}" + uninstall quit: "com.logcg.inputmethod.LogInputMac#{version.major}", + pkgutil: "com.logcg.pkg.LoginputMac#{version.major}" zap trash: [ "~/Documents/落格输入法", diff --git a/Casks/l/logitech-camera-settings.rb b/Casks/l/logitech-camera-settings.rb index 68548ee696..1196497827 100644 --- a/Casks/l/logitech-camera-settings.rb +++ b/Casks/l/logitech-camera-settings.rb @@ -17,12 +17,12 @@ cask "logitech-camera-settings" do pkg "LogiCameraSettings_#{version}.pkg" uninstall signal: ["TERM", "com.logitech.vc.LogiVCCoreService"], + login_item: "Background Replace", pkgutil: [ "com.logitech.vc.LogiVCCoreService.launchd.pkg", "com.logitech.vc.LogiVCCoreService.app.pkg", "com.logitech.vc.CameraSettings.pkg", - ], - login_item: "Background Replace" + ] zap trash: [ "~/Library/Application Support/Logitech/com.logitech.vc.camerasettings", diff --git a/Casks/l/logitech-presentation.rb b/Casks/l/logitech-presentation.rb index 4a6c0fa01b..31e71f2e8e 100644 --- a/Casks/l/logitech-presentation.rb +++ b/Casks/l/logitech-presentation.rb @@ -18,9 +18,9 @@ cask "logitech-presentation" do installer manual: "LogiPresentation Installer.app" - uninstall delete: "/Applications/Logitech Presentation", + uninstall signal: ["KILL", "LogiPresentation"], login_item: "LogiPresentation", - signal: ["KILL", "LogiPresentation"] + delete: "/Applications/Logitech Presentation" zap trash: "/Library/Application Support/Logitech.localized/Logitech Presentation.localiz" end diff --git a/Casks/l/loopback.rb b/Casks/l/loopback.rb index 25f1d202de..97db9f713c 100644 --- a/Casks/l/loopback.rb +++ b/Casks/l/loopback.rb @@ -17,11 +17,11 @@ cask "loopback" do app "Loopback.app" - uninstall delete: "~/Library/LaunchAgents/com.rogueamoeba.loopbackd.plist", - quit: [ + uninstall quit: [ "com.rogueamoeba.Loopback", "com.rogueamoeba.loopbackd", - ] + ], + delete: "~/Library/LaunchAgents/com.rogueamoeba.loopbackd.plist" zap trash: [ "~/Library/Application Support/Loopback", diff --git a/Casks/l/loupedeck.rb b/Casks/l/loupedeck.rb index 76b9a68427..db8b4bbf4e 100644 --- a/Casks/l/loupedeck.rb +++ b/Casks/l/loupedeck.rb @@ -17,14 +17,14 @@ cask "loupedeck" do pkg "LoupedeckInstaller.pkg" - uninstall signal: [ + uninstall launchctl: "com.loupedeck.loupedeck2.launch", + signal: [ ["TERM", "com.loupedeck.Loupedeck2"], ["QUIT", "com.loupedeck.Loupedeck2"], ["INT", "com.loupedeck.Loupedeck2"], ["HUP", "com.loupedeck.Loupedeck2"], ["KILL", "com.loupedeck.Loupedeck2"], ], - launchctl: "com.loupedeck.loupedeck2.launch", pkgutil: [ "com.loupedeck.ImageLibraryInstaller", "com.loupedeck.LibraryInstaller", diff --git a/Casks/l/luniistore.rb b/Casks/l/luniistore.rb index e5be15cf5a..8f62c147d9 100644 --- a/Casks/l/luniistore.rb +++ b/Casks/l/luniistore.rb @@ -29,8 +29,8 @@ cask "luniistore" do return unless system_command "/usr/bin/pkill", args: ["-f", "/Applications/Luniistore.app"] end - uninstall pkgutil: "com.lunii.luniistore", - quit: "com.lunii.luniistore" + uninstall quit: "com.lunii.luniistore", + pkgutil: "com.lunii.luniistore" zap trash: [ "~/Desktop/Luniistore", diff --git a/Casks/m/macforge.rb b/Casks/m/macforge.rb index bea4dc0cc3..a54b4ff269 100644 --- a/Casks/m/macforge.rb +++ b/Casks/m/macforge.rb @@ -19,7 +19,6 @@ cask "macforge" do app "MacForge.app" uninstall launchctl: "com.macenhance.MacForge.Injector", - login_item: "MacForgeHelper", quit: [ "com.macenhance.MacForge", "com.macenhance.MacForge.PreferenceLoader", @@ -27,6 +26,7 @@ cask "macforge" do "com.macenhance.MacForgeHelper", "com.macenhance.SIPKit", ], + login_item: "MacForgeHelper", delete: [ "/Library/Application Support/MacEnhance", "/Library/LaunchDaemons/com.macenhance.MacForge.Injector.plist", diff --git a/Casks/m/macupdater.rb b/Casks/m/macupdater.rb index 89f64cb845..c86719a23c 100644 --- a/Casks/m/macupdater.rb +++ b/Casks/m/macupdater.rb @@ -27,8 +27,8 @@ cask "macupdater" do app "MacUpdater.app" binary "#{appdir}/MacUpdater.app/Contents/Resources/macupdater_client" - uninstall quit: "com.corecode.MacUpdater", - launchctl: "com.corecode.MacUpdaterLaunchHelper" + uninstall launchctl: "com.corecode.MacUpdaterLaunchHelper", + quit: "com.corecode.MacUpdater" zap trash: [ "~/Library/Application Scripts/com.corecode.MacUpdaterLaunchHelper", diff --git a/Casks/m/malwarebytes.rb b/Casks/m/malwarebytes.rb index c396bfbf53..e1dafcf201 100644 --- a/Casks/m/malwarebytes.rb +++ b/Casks/m/malwarebytes.rb @@ -18,15 +18,15 @@ cask "malwarebytes" do pkg "Malwarebytes-Mac-#{version}.pkg" - uninstall delete: "/Library/Application Support/Malwarebytes/MBAM", - kext: "com.malwarebytes.mbam.rtprotection", - launchctl: [ + uninstall launchctl: [ "com.malwarebytes.mbam.frontend.agent", "com.malwarebytes.mbam.rtprotection.daemon", "com.malwarebytes.mbam.settings.daemon", ], - pkgutil: "com.malwarebytes.mbam.*", quit: "com.malwarebytes.mbam.frontend.agent", + kext: "com.malwarebytes.mbam.rtprotection", + pkgutil: "com.malwarebytes.mbam.*", + delete: "/Library/Application Support/Malwarebytes/MBAM", rmdir: "/Library/Application Support/Malwarebytes" zap trash: [ diff --git a/Casks/m/mamp.rb b/Casks/m/mamp.rb index 893b14875d..9615dd3987 100644 --- a/Casks/m/mamp.rb +++ b/Casks/m/mamp.rb @@ -27,7 +27,12 @@ cask "mamp" do uninstall pkgutil: "de.appsolute.installer.(mamp|mampacticon|mampendinstall|mamppro).pkg", delete: "/Applications/MAMP" - zap trash: [ + zap delete: [ + "/Library/LaunchDaemons/de.appsolute.mampprohelper.plist", + "/Library/PrivilegedHelperTools/de.appsolute.mampprohelper", + "/Library/Application Support/appsolute", + ], + trash: [ "~/Library/Application Support/appsolute", "~/Library/Application Support/de.appsolute.MAMP", "~/Library/Application Support/de.appsolute.mamppro", @@ -39,10 +44,5 @@ cask "mamp" do "~/Library/Preferences/de.appsolute.mamppro.plist", "~/Library/Saved Application State/de.appsolute.MAMP.savedState", "~/Library/Saved Application State/de.appsolute.mamppro.savedState", - ], - delete: [ - "/Library/LaunchDaemons/de.appsolute.mampprohelper.plist", - "/Library/PrivilegedHelperTools/de.appsolute.mampprohelper", - "/Library/Application Support/appsolute", ] end diff --git a/Casks/m/maxon.rb b/Casks/m/maxon.rb index 56f36fb2c0..88a66bad9d 100644 --- a/Casks/m/maxon.rb +++ b/Casks/m/maxon.rb @@ -17,17 +17,17 @@ cask "maxon" do sudo: true, } - uninstall delete: [ + uninstall launchctl: [ + "com.maxon.mxnotify.agent", + "com.maxon.mxredirect.agent", + "com.redgiant.service", + ], + delete: [ "/Applications/Maxon.app", "/Library/Application Support/Maxon", "/Library/Application Support/Red Giant", "/Library/Logs/Maxon", "/Library/Logs/Red Giant", - ], - launchctl: [ - "com.maxon.mxnotify.agent", - "com.maxon.mxredirect.agent", - "com.redgiant.service", ] zap trash: [ diff --git a/Casks/m/mds.rb b/Casks/m/mds.rb index 9d98113901..0100a01970 100644 --- a/Casks/m/mds.rb +++ b/Casks/m/mds.rb @@ -21,8 +21,8 @@ cask "mds" do pkg "MDS.pkg" - uninstall pkgutil: "com.twocanoes.pkg.MDS", - launchctl: "com.mds-micromdm" + uninstall launchctl: "com.mds-micromdm", + pkgutil: "com.twocanoes.pkg.MDS" zap trash: [ "/usr/local/mds-micromdm", diff --git a/Casks/m/megasync.rb b/Casks/m/megasync.rb index 1bfff820a6..1d94fd95c9 100644 --- a/Casks/m/megasync.rb +++ b/Casks/m/megasync.rb @@ -19,8 +19,8 @@ cask "megasync" do app "MEGAsync.app" - uninstall quit: "mega.mac", - launchctl: "mega.mac.megaupdater", + uninstall launchctl: "mega.mac.megaupdater", + quit: "mega.mac", login_item: "MEGAsync" zap trash: [ diff --git a/Casks/m/micro-snitch.rb b/Casks/m/micro-snitch.rb index a3a7bd1b77..e86828549e 100644 --- a/Casks/m/micro-snitch.rb +++ b/Casks/m/micro-snitch.rb @@ -17,8 +17,8 @@ cask "micro-snitch" do app "Micro Snitch.app" - uninstall quit: "at.obdev.MicroSnitch", - launchctl: "at.obdev.MicroSnitchOpenAtLoginHelper" + uninstall launchctl: "at.obdev.MicroSnitchOpenAtLoginHelper", + quit: "at.obdev.MicroSnitch" zap trash: [ "~/Library/Application Support/at.obdev.MicroSnitchOpenAtLoginHelper", diff --git a/Casks/m/microsoft-auto-update.rb b/Casks/m/microsoft-auto-update.rb index 937175573f..e1f6ec23d7 100644 --- a/Casks/m/microsoft-auto-update.rb +++ b/Casks/m/microsoft-auto-update.rb @@ -24,16 +24,16 @@ cask "microsoft-auto-update" do pkg "Microsoft_AutoUpdate_#{version}_Updater.pkg" - uninstall quit: [ - "com.microsoft.autoupdate.fba", - "com.microsoft.autoupdate2", - "com.microsoft.errorreporting", - ], - launchctl: [ + uninstall launchctl: [ "com.microsoft.autoupdate.helper", "com.microsoft.autoupdate.helpertool", "com.microsoft.update.agent", ], + quit: [ + "com.microsoft.autoupdate.fba", + "com.microsoft.autoupdate2", + "com.microsoft.errorreporting", + ], pkgutil: [ "com.microsoft.package.Microsoft_AU_Bootstrapper.app", "com.microsoft.package.Microsoft_AutoUpdate.app", diff --git a/Casks/m/microsoft-edge.rb b/Casks/m/microsoft-edge.rb index 13a8113636..4f3fdf2504 100644 --- a/Casks/m/microsoft-edge.rb +++ b/Casks/m/microsoft-edge.rb @@ -34,15 +34,14 @@ cask "microsoft-edge" do }, ] - uninstall pkgutil: "com.microsoft.edgemac", - launchctl: [ + uninstall launchctl: [ "com.microsoft.EdgeUpdater.update-internal.109.0.1518.89.system", "com.microsoft.EdgeUpdater.update.system", "com.microsoft.EdgeUpdater.wake.109.0.1518.89.system", - ] + ], + pkgutil: "com.microsoft.edgemac" zap delete: "/Library/Application Support/Microsoft/EdgeUpdater", - rmdir: "/Library/Application Support/Microsoft", trash: [ "~/Library/Application Scripts/com.microsoft.edgemac.wdgExtension", "~/Library/Application Support/Microsoft Edge", @@ -57,5 +56,6 @@ cask "microsoft-edge" do "~/Library/Preferences/com.microsoft.edgemac.plist", "~/Library/Saved Application State/com.microsoft.edgemac.*", "~/Library/WebKit/com.microsoft.edgemac", - ] + ], + rmdir: "/Library/Application Support/Microsoft" end diff --git a/Casks/m/microsoft-excel.rb b/Casks/m/microsoft-excel.rb index 1ed143d715..c1c4ef9693 100644 --- a/Casks/m/microsoft-excel.rb +++ b/Casks/m/microsoft-excel.rb @@ -78,12 +78,12 @@ cask "microsoft-excel" do }, ] - uninstall pkgutil: [ + uninstall launchctl: "com.microsoft.office.licensingV2.helper", + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.package.Microsoft_Excel.app", "com.microsoft.pkg.licensing", - ], - launchctl: "com.microsoft.office.licensingV2.helper", - quit: "com.microsoft.autoupdate2" + ] zap trash: [ "~/Library/Application Scripts/com.microsoft.Excel", diff --git a/Casks/m/microsoft-office-businesspro.rb b/Casks/m/microsoft-office-businesspro.rb index bbbb2d8412..ab5836a7ce 100644 --- a/Casks/m/microsoft-office-businesspro.rb +++ b/Casks/m/microsoft-office-businesspro.rb @@ -37,7 +37,17 @@ cask "microsoft-office-businesspro" do }, ] - uninstall pkgutil: [ + uninstall launchctl: [ + "com.microsoft.office.licensing.helper", + "com.microsoft.office.licensingV2.helper", + "com.microsoft.OneDriveStandaloneUpdater", + "com.microsoft.OneDriveStandaloneUpdaterDaemon", + "com.microsoft.OneDriveUpdaterDaemon", + "com.microsoft.SyncReporter", + "com.microsoft.teams.TeamsUpdaterDaemon", + ], + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.MSTeamsAudioDevice", "com.microsoft.OneDrive", "com.microsoft.package.DFonts", @@ -53,7 +63,6 @@ cask "microsoft-office-businesspro" do "com.microsoft.teams", "com.microsoft.wdav", ], - # Frameworks, DFonts and ProofingTools remain in each application after pkg uninstall, delete them delete: [ "/Applications/Microsoft Defender.app", "/Applications/Microsoft Excel.app", @@ -63,17 +72,7 @@ cask "microsoft-office-businesspro" do "/Applications/Microsoft Teams.app", "/Applications/Microsoft Word.app", "/Applications/OneDrive.app", - ], - launchctl: [ - "com.microsoft.office.licensing.helper", - "com.microsoft.office.licensingV2.helper", - "com.microsoft.OneDriveStandaloneUpdater", - "com.microsoft.OneDriveStandaloneUpdaterDaemon", - "com.microsoft.OneDriveUpdaterDaemon", - "com.microsoft.SyncReporter", - "com.microsoft.teams.TeamsUpdaterDaemon", - ], - quit: "com.microsoft.autoupdate2" + ] zap trash: [ "~/Library/Application Scripts/com.microsoft.errorreporting", diff --git a/Casks/m/microsoft-office.rb b/Casks/m/microsoft-office.rb index 0520b2d86a..c741113055 100644 --- a/Casks/m/microsoft-office.rb +++ b/Casks/m/microsoft-office.rb @@ -35,7 +35,16 @@ cask "microsoft-office" do }, ] - uninstall pkgutil: [ + uninstall launchctl: [ + "com.microsoft.office.licensing.helper", + "com.microsoft.office.licensingV2.helper", + "com.microsoft.OneDriveStandaloneUpdater", + "com.microsoft.OneDriveStandaloneUpdaterDaemon", + "com.microsoft.OneDriveUpdaterDaemon", + "com.microsoft.SyncReporter", + ], + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.OneDrive", "com.microsoft.package.DFonts", "com.microsoft.package.Frameworks", @@ -48,7 +57,6 @@ cask "microsoft-office" do "com.microsoft.package.Proofing_Tools", "com.microsoft.pkg.licensing", ], - # Frameworks, DFonts and ProofingTools remain in each application after pkg uninstall, delete them delete: [ "/Applications/Microsoft Excel.app", "/Applications/Microsoft OneNote.app", @@ -56,16 +64,7 @@ cask "microsoft-office" do "/Applications/Microsoft PowerPoint.app", "/Applications/Microsoft Word.app", "/Applications/OneDrive.app", - ], - launchctl: [ - "com.microsoft.office.licensing.helper", - "com.microsoft.office.licensingV2.helper", - "com.microsoft.OneDriveStandaloneUpdater", - "com.microsoft.OneDriveStandaloneUpdaterDaemon", - "com.microsoft.OneDriveUpdaterDaemon", - "com.microsoft.SyncReporter", - ], - quit: "com.microsoft.autoupdate2" + ] zap trash: [ "~/Library/Application Scripts/com.microsoft.errorreporting", diff --git a/Casks/m/microsoft-outlook.rb b/Casks/m/microsoft-outlook.rb index 520c399db6..264a900c47 100644 --- a/Casks/m/microsoft-outlook.rb +++ b/Casks/m/microsoft-outlook.rb @@ -78,12 +78,12 @@ cask "microsoft-outlook" do }, ] - uninstall pkgutil: [ + uninstall launchctl: "com.microsoft.office.licensingV2.helper", + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.package.Microsoft_Outlook.app", "com.microsoft.pkg.licensing", - ], - launchctl: "com.microsoft.office.licensingV2.helper", - quit: "com.microsoft.autoupdate2" + ] zap trash: [ "~/Library/Application Scripts/com.microsoft.Outlook", diff --git a/Casks/m/microsoft-powerpoint.rb b/Casks/m/microsoft-powerpoint.rb index 6b393839e0..195febb335 100644 --- a/Casks/m/microsoft-powerpoint.rb +++ b/Casks/m/microsoft-powerpoint.rb @@ -78,13 +78,13 @@ cask "microsoft-powerpoint" do }, ] - uninstall pkgutil: [ + uninstall launchctl: "com.microsoft.office.licensingV2.helper", + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.package.Microsoft_PowerPoint.app", "com.microsoft.pkg.licensing", ], - delete: "/Applications/Microsoft PowerPoint.app", - launchctl: "com.microsoft.office.licensingV2.helper", - quit: "com.microsoft.autoupdate2" + delete: "/Applications/Microsoft PowerPoint.app" zap trash: [ "~/Library/Application Scripts/com.microsoft.Powerpoint", diff --git a/Casks/m/microsoft-remote-desktop.rb b/Casks/m/microsoft-remote-desktop.rb index be61bf761f..585b7c39e7 100644 --- a/Casks/m/microsoft-remote-desktop.rb +++ b/Casks/m/microsoft-remote-desktop.rb @@ -18,11 +18,7 @@ cask "microsoft-remote-desktop" do pkg "Microsoft_Remote_Desktop_#{version}_installer.pkg" - uninstall pkgutil: [ - "com.microsoft.rdc.macos", - "com.microsoft.package.Microsoft_AutoUpdate.app", - ], - launchctl: [ + uninstall launchctl: [ "com.microsoft.autoupdate.helper", "com.microsoft.update.agent", ], @@ -30,6 +26,10 @@ cask "microsoft-remote-desktop" do "com.microsoft.autoupdate2", "com.microsoft.autoupdate.fba", "com.microsoft.errorreporting", + ], + pkgutil: [ + "com.microsoft.rdc.macos", + "com.microsoft.package.Microsoft_AutoUpdate.app", ] zap trash: [ diff --git a/Casks/m/microsoft-teams.rb b/Casks/m/microsoft-teams.rb index e6996ad958..571708369c 100644 --- a/Casks/m/microsoft-teams.rb +++ b/Casks/m/microsoft-teams.rb @@ -39,13 +39,13 @@ cask "microsoft-teams" do }, ] - uninstall pkgutil: [ + uninstall launchctl: "com.microsoft.teams.TeamsUpdaterDaemon", + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.MSTeamsAudioDevice", "com.microsoft.package.Microsoft_AutoUpdate.app", "com.microsoft.teams2", ], - launchctl: "com.microsoft.teams.TeamsUpdaterDaemon", - quit: "com.microsoft.autoupdate2", delete: [ "/Applications/Microsoft Teams (work or school).app", "/Library/Application Support/Microsoft/TeamsUpdaterDaemon", diff --git a/Casks/m/microsoft-word.rb b/Casks/m/microsoft-word.rb index cf9f0a951d..23f4669171 100644 --- a/Casks/m/microsoft-word.rb +++ b/Casks/m/microsoft-word.rb @@ -78,12 +78,12 @@ cask "microsoft-word" do }, ] - uninstall pkgutil: [ + uninstall launchctl: "com.microsoft.office.licensingV2.helper", + quit: "com.microsoft.autoupdate2", + pkgutil: [ "com.microsoft.package.Microsoft_Word.app", "com.microsoft.pkg.licensing", - ], - launchctl: "com.microsoft.office.licensingV2.helper", - quit: "com.microsoft.autoupdate2" + ] zap trash: [ "~/Library/Application Scripts/com.microsoft.Word", diff --git a/Casks/m/middleclick.rb b/Casks/m/middleclick.rb index bc34fa0fac..9e531769f2 100644 --- a/Casks/m/middleclick.rb +++ b/Casks/m/middleclick.rb @@ -14,8 +14,8 @@ cask "middleclick" do app "MiddleClick.app" - uninstall login_item: "MiddleClick", - quit: "com.rouge41.middleClick" + uninstall quit: "com.rouge41.middleClick", + login_item: "MiddleClick" zap trash: "~/Library/Preferences/com.rouge41.middleClick.plist" end diff --git a/Casks/m/mipony.rb b/Casks/m/mipony.rb index 8eeee67b25..909fa38dd5 100644 --- a/Casks/m/mipony.rb +++ b/Casks/m/mipony.rb @@ -14,6 +14,6 @@ cask "mipony" do pkg "Mipony-Installer.pkg" - uninstall pkgutil: "net.installer.mipony.*", - quit: "com.downloader.Mipony" + uninstall quit: "com.downloader.Mipony", + pkgutil: "net.installer.mipony.*" end diff --git a/Casks/m/mist.rb b/Casks/m/mist.rb index d092a57f16..60f6b4bd6a 100644 --- a/Casks/m/mist.rb +++ b/Casks/m/mist.rb @@ -12,11 +12,11 @@ cask "mist" do pkg "Mist.#{version}.pkg" - uninstall quit: [ + uninstall launchctl: "com.ninxsoft.mist.helper", + quit: [ "com.ninxsoft.mist.helper", "com.ninxsoft.mist", ], - launchctl: "com.ninxsoft.mist.helper", pkgutil: "com.ninxsoft.pkg.mist", delete: [ "/Library/LaunchDaemons/com.ninxsoft.mist.helper.plist", diff --git a/Casks/m/mmhmm-studio.rb b/Casks/m/mmhmm-studio.rb index 9225ec955e..ff3f30cf19 100644 --- a/Casks/m/mmhmm-studio.rb +++ b/Casks/m/mmhmm-studio.rb @@ -35,13 +35,13 @@ cask "mmhmm-studio" do app "mmhmm Studio.app" - uninstall pkgutil: "app.mmhmm.app", + uninstall launchctl: "app.mmhmm.Camera.Assistant", quit: "app.mmhmm.app", + pkgutil: "app.mmhmm.app", delete: [ "/Library/Audio/Plug-Ins/HAL/mmhmmAudio.driver", "/Library/CoreMediaIO/Plug-Ins/DAL/mmhmmCamera.plugin", - ], - launchctl: "app.mmhmm.Camera.Assistant" + ] zap trash: [ "~/Library/Preferences/app.mmhmm.app.plist", diff --git a/Casks/m/mmhmm.rb b/Casks/m/mmhmm.rb index fc739d71d6..12268ed69e 100644 --- a/Casks/m/mmhmm.rb +++ b/Casks/m/mmhmm.rb @@ -17,8 +17,8 @@ cask "mmhmm" do pkg "mmhmm.pkg" - uninstall pkgutil: "app.mmhmm.hybrid", - quit: "app.mmhmm.hybrid" + uninstall quit: "app.mmhmm.hybrid", + pkgutil: "app.mmhmm.hybrid" zap trash: [ "~/Library/Application Support/mmhmm", diff --git a/Casks/m/monity-helper.rb b/Casks/m/monity-helper.rb index 4f4be569eb..8489c01bf3 100644 --- a/Casks/m/monity-helper.rb +++ b/Casks/m/monity-helper.rb @@ -14,8 +14,8 @@ cask "monity-helper" do pkg "MonityHelper.pkg" - uninstall quit: "com.Monity.Helper", - launchctl: "com.Monity.Helper", + uninstall launchctl: "com.Monity.Helper", + quit: "com.Monity.Helper", pkgutil: [ "com.Monity.Helper.monityHelper.com.Monity.Helper.pkg", "com.Monity.Helper.monityHelper.MonityHelper.pkg", diff --git a/Casks/m/mono-mdk.rb b/Casks/m/mono-mdk.rb index 3181d4ecae..461d66a28c 100644 --- a/Casks/m/mono-mdk.rb +++ b/Casks/m/mono-mdk.rb @@ -17,11 +17,11 @@ cask "mono-mdk" do pkg "MonoFramework-MDK-#{version}.macos10.xamarin.universal.pkg" - uninstall delete: [ + uninstall pkgutil: "com.xamarin.mono-*", + delete: [ "/Library/Frameworks/Mono.framework/Versions/#{version.major_minor_patch}", "/private/etc/paths.d/mono-commands", ], - pkgutil: "com.xamarin.mono-*", rmdir: [ "/Library/Frameworks/Mono.framework/Versions", "/Library/Frameworks/Mono.framework", diff --git a/Casks/m/mu-editor.rb b/Casks/m/mu-editor.rb index fde434273d..13d2b9a3cb 100644 --- a/Casks/m/mu-editor.rb +++ b/Casks/m/mu-editor.rb @@ -10,9 +10,9 @@ cask "mu-editor" do app "Mu Editor.app" - zap rmdir: "~/mu_code", - trash: [ + zap trash: [ "~/Library/Application Support/mu", "~/Library/Logs/mu", - ] + ], + rmdir: "~/mu_code" end diff --git a/Casks/m/mullvadvpn.rb b/Casks/m/mullvadvpn.rb index 103a6fd461..079693268b 100644 --- a/Casks/m/mullvadvpn.rb +++ b/Casks/m/mullvadvpn.rb @@ -18,8 +18,8 @@ cask "mullvadvpn" do pkg "MullvadVPN-#{version}.pkg" - uninstall pkgutil: "net.mullvad.vpn", - launchctl: "net.mullvad.daemon", + uninstall launchctl: "net.mullvad.daemon", + pkgutil: "net.mullvad.vpn", delete: [ "/Library/Caches/mullvad-vpn", "/Library/LaunchDaemons/net.mullvad.daemon.plist", diff --git a/Casks/m/munki.rb b/Casks/m/munki.rb index 89c86ac090..a99c7273ee 100644 --- a/Casks/m/munki.rb +++ b/Casks/m/munki.rb @@ -23,8 +23,7 @@ cask "munki" do pkg "munkitools-#{version}.pkg" - uninstall pkgutil: "com.googlecode.munki.*", - launchctl: [ + uninstall launchctl: [ "com.googlecode.munki.app_usage_monitor", "com.googlecode.munki.appusaged", "com.googlecode.munki.logouthelper", @@ -34,6 +33,7 @@ cask "munki" do "com.googlecode.munki.managedsoftwareupdate-manualcheck", "com.googlecode.munki.munki-notifier", ], + pkgutil: "com.googlecode.munki.*", delete: "/usr/local/munki" zap trash: [ diff --git a/Casks/m/music-manager.rb b/Casks/m/music-manager.rb index bf364722b8..e1511f3b11 100644 --- a/Casks/m/music-manager.rb +++ b/Casks/m/music-manager.rb @@ -16,8 +16,8 @@ cask "music-manager" do # Original discussion: https://github.com/Homebrew/homebrew-cask/pull/4282 app "MusicManager.app", target: "Music Manager.app" - uninstall delete: "~/Library/PreferencePanes/MusicManager.prefPane", - quit: "com.google.musicmanager" + uninstall quit: "com.google.musicmanager", + delete: "~/Library/PreferencePanes/MusicManager.prefPane" zap trash: [ "~/Library/Application Support/Google/MusicManager", diff --git a/Casks/m/mutedeck.rb b/Casks/m/mutedeck.rb index a8d24dde5b..64c2b6e74b 100644 --- a/Casks/m/mutedeck.rb +++ b/Casks/m/mutedeck.rb @@ -18,8 +18,8 @@ cask "mutedeck" do installer manual: "MuteDeck-#{version}-Installer" - uninstall quit: "com.mutedeck.mac", - launchctl: "application.com.mutedeck.mac", + uninstall launchctl: "application.com.mutedeck.mac", + quit: "com.mutedeck.mac", delete: "/Applications/MuteDeck" zap trash: "~/Library/Application Support/mutedeck" diff --git a/Casks/m/my-image-garden.rb b/Casks/m/my-image-garden.rb index a446e5b11a..2f2681e641 100644 --- a/Casks/m/my-image-garden.rb +++ b/Casks/m/my-image-garden.rb @@ -21,8 +21,8 @@ cask "my-image-garden" do pkg "My Image Garden V#{version.csv.first.no_dots}.pkg" - uninstall pkgutil: "jp.co.canon.MyImageGarden", - quit: "jp.co.canon.MyImageGarden" + uninstall quit: "jp.co.canon.MyImageGarden", + pkgutil: "jp.co.canon.MyImageGarden" zap trash: [ "/Library/Caches/Canon", diff --git a/Casks/m/mycloud.rb b/Casks/m/mycloud.rb index 8a672c375e..18e1b24ac1 100644 --- a/Casks/m/mycloud.rb +++ b/Casks/m/mycloud.rb @@ -16,10 +16,10 @@ cask "mycloud" do # pkg cannot be installed automatically installer manual: "myCloud Desktop installer.pkg" - uninstall pkgutil: "com.github.tornaia.desktop-client", + uninstall quit: "ch.swisscom.mycloud.desktop.finder", + signal: ["TERM", "ch.swisscom.mycloud.desktop"], login_item: "myCloudDesktop", - quit: "ch.swisscom.mycloud.desktop.finder", - signal: ["TERM", "ch.swisscom.mycloud.desktop"] + pkgutil: "com.github.tornaia.desktop-client" zap trash: [ "~/Library/Application Support/myCloudDesktop", diff --git a/Casks/n/native-access.rb b/Casks/n/native-access.rb index 31cf644085..c4acf344bc 100644 --- a/Casks/n/native-access.rb +++ b/Casks/n/native-access.rb @@ -19,8 +19,8 @@ cask "native-access" do app "Native Access.app" - uninstall quit: "com.native-instruments.Native Access", - launchctl: "com.native-instruments.NativeAccess.Helper2", + uninstall launchctl: "com.native-instruments.NativeAccess.Helper2", + quit: "com.native-instruments.Native Access", delete: [ "/Library/Application Support/Native Instruments", "/Library/Preferences/com.native-instruments.NTKDaemon.plist", diff --git a/Casks/n/nomachine-enterprise-client.rb b/Casks/n/nomachine-enterprise-client.rb index 6b1d32d20e..4c335485de 100644 --- a/Casks/n/nomachine-enterprise-client.rb +++ b/Casks/n/nomachine-enterprise-client.rb @@ -16,17 +16,16 @@ cask "nomachine-enterprise-client" do # A launchctl job ordinarily manages uninstall once the app bundle is removed # To ensure it ran, verify if /Library/Application Support/NoMachine/nxuninstall.sh no longer exists - uninstall delete: "/Applications/NoMachine.app", + uninstall launchctl: [ + "com.nomachine.launchconf", + "com.nomachine.uninstall", + "com.nomachine.uninstallAgent", + ], pkgutil: [ "com.nomachine.nomachine.NoMachine*.pkg", "com.nomachine.*", ], - - launchctl: [ - "com.nomachine.launchconf", - "com.nomachine.uninstall", - "com.nomachine.uninstallAgent", - ] + delete: "/Applications/NoMachine.app" zap trash: [ "/Library/Application Support/NoMachine", diff --git a/Casks/n/nomachine.rb b/Casks/n/nomachine.rb index 9c495d02ed..0d6db9e5f5 100644 --- a/Casks/n/nomachine.rb +++ b/Casks/n/nomachine.rb @@ -18,16 +18,7 @@ cask "nomachine" do # A launchctl job ordinarily manages uninstall once the app bundle is removed # To ensure it ran, verify if /Library/Application Support/NoMachine/nxuninstall.sh no longer exists - uninstall delete: "/Applications/NoMachine.app", - pkgutil: [ - "com.nomachine.nomachine.NoMachine-*.pkg", - "com.nomachine.nxnode", - "com.nomachine.nxplayer", - "com.nomachine.nxrunner", - "com.nomachine.nxserver", - ], - - launchctl: [ + uninstall launchctl: [ "com.nomachine.localnxserver", "com.nomachine.nxlaunchconf", "com.nomachine.nxnode", @@ -37,7 +28,15 @@ cask "nomachine" do "com.nomachine.uninstall", "com.nomachine.uninstallAgent", "com.nomachine.server", - ] + ], + pkgutil: [ + "com.nomachine.nomachine.NoMachine-*.pkg", + "com.nomachine.nxnode", + "com.nomachine.nxplayer", + "com.nomachine.nxrunner", + "com.nomachine.nxserver", + ], + delete: "/Applications/NoMachine.app" zap trash: [ "/Library/Application Support/NoMachine", diff --git a/Casks/n/nordlayer.rb b/Casks/n/nordlayer.rb index 0bc619caea..8603f1aaa8 100644 --- a/Casks/n/nordlayer.rb +++ b/Casks/n/nordlayer.rb @@ -17,8 +17,8 @@ cask "nordlayer" do app "NordLayer.app" - uninstall quit: "com.nordvpn.macos.teams", - launchctl: "com.nordvpn.macos.teams" + uninstall launchctl: "com.nordvpn.macos.teams", + quit: "com.nordvpn.macos.teams" zap trash: [ "~/Library/Application Support/com.nordvpn.macos.teams", diff --git a/Casks/n/nordlocker.rb b/Casks/n/nordlocker.rb index 0def3aaf9c..16bc54cddc 100644 --- a/Casks/n/nordlocker.rb +++ b/Casks/n/nordlocker.rb @@ -18,17 +18,17 @@ cask "nordlocker" do pkg "NordLocker.pkg" - uninstall quit: [ - "com.nordlocker.macos", - "com.nordlocker.macos.launcher", - ], - launchctl: [ + uninstall launchctl: [ "com.nordlocker.macos.launcher", "com.nordlocker.nordfs.Mounter.Helper", ], - delete: "/Library/PrivilegedHelperTools/com.nordlocker.nordfs.Mounter.Helper", + quit: [ + "com.nordlocker.macos", + "com.nordlocker.macos.launcher", + ], login_item: "NordLocker", - pkgutil: "com.nordlocker.macos" + pkgutil: "com.nordlocker.macos", + delete: "/Library/PrivilegedHelperTools/com.nordlocker.nordfs.Mounter.Helper" zap trash: [ "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.nordlocker.macos.sfl2", diff --git a/Casks/n/nordvpn.rb b/Casks/n/nordvpn.rb index 7b74051922..ef5a349010 100644 --- a/Casks/n/nordvpn.rb +++ b/Casks/n/nordvpn.rb @@ -18,21 +18,21 @@ cask "nordvpn" do pkg "NordVPN.pkg" - uninstall quit: [ - "com.nordvpn.macos", - "com.nordvpn.macos.NordVPNLauncher", - ], - launchctl: [ + uninstall launchctl: [ "com.nordvpn.macos.helper", "com.nordvpn.NordVPN.Helper", ], + quit: [ + "com.nordvpn.macos", + "com.nordvpn.macos.NordVPNLauncher", + ], + login_item: "NordVPN", + pkgutil: "com.nordvpn.macos", delete: [ "/Library/PrivilegedHelperTools/com.nordvpn.macos.helper", "/Library/PrivilegedHelperTools/com.nordvpn.macos.ovpnDnsManager", "/Library/PrivilegedHelperTools/ovpn", - ], - login_item: "NordVPN", - pkgutil: "com.nordvpn.macos" + ] zap trash: [ "~/Library/Application Support/com.nordvpn.macos", diff --git a/Casks/o/onedrive.rb b/Casks/o/onedrive.rb index 8ff1ba90d5..68544b6495 100644 --- a/Casks/o/onedrive.rb +++ b/Casks/o/onedrive.rb @@ -22,8 +22,7 @@ cask "onedrive" do pkg "OneDrive.pkg" - uninstall pkgutil: "com.microsoft.OneDrive", - launchctl: [ + uninstall launchctl: [ "com.microsoft.OneDriveStandaloneUpdater", "com.microsoft.OneDriveStandaloneUpdaterDaemon", "com.microsoft.OneDriveUpdaterDaemon", @@ -34,6 +33,7 @@ cask "onedrive" do "com.microsoft.OneDrive.FinderSync", "com.microsoft.OneDriveUpdater", ], + pkgutil: "com.microsoft.OneDrive", delete: [ "/Applications/OneDrive.app", "/Library/Logs/Microsoft/OneDrive", diff --git a/Casks/o/opensc.rb b/Casks/o/opensc.rb index 9bc4f9e90f..763c0cfdf1 100644 --- a/Casks/o/opensc.rb +++ b/Casks/o/opensc.rb @@ -9,17 +9,17 @@ cask "opensc" do pkg "OpenSC #{version}.pkg" - uninstall script: { + uninstall launchctl: [ + "org.opensc-project.mac.opensc-notify", + "org.opensc-project.mac.pkcs11-register", + ], + script: { executable: "/usr/local/bin/opensc-uninstall", sudo: true, }, pkgutil: [ "org.opensc-project.mac.opensctoken", "org.opensc-project.startup", - ], - launchctl: [ - "org.opensc-project.mac.opensc-notify", - "org.opensc-project.mac.pkcs11-register", ] zap trash: "~/Library/Saved Application State/org.opensc-project.mac.opensctoken.OpenSCTokenApp.savedState" diff --git a/Casks/o/openvpn-connect.rb b/Casks/o/openvpn-connect.rb index e494fad897..137881e0df 100644 --- a/Casks/o/openvpn-connect.rb +++ b/Casks/o/openvpn-connect.rb @@ -19,11 +19,12 @@ cask "openvpn-connect" do pkg "OpenVPN_Connect_#{version.csv.first.dots_to_underscores}(#{version.csv.second})_#{arch}_Installer_signed.pkg" - uninstall quit: "org.openvpn.client.app", - launchctl: [ + uninstall launchctl: [ "org.openvpn.client", "org.openvpn.helper", ], + quit: "org.openvpn.client.app", + login_item: "OpenVPN Connect", pkgutil: [ "org.openvpn.client.pkg", "org.openvpn.client_framework.pkg", @@ -35,18 +36,17 @@ cask "openvpn-connect" do delete: [ "/Applications/OpenVPN Connect", "/Applications/OpenVPN Connect.app", - ], - login_item: "OpenVPN Connect" + ] - zap trash: [ + zap script: { + executable: "security", + args: ["delete-keychain", "openvpn.keychain-db"], + }, + trash: [ "~/Library/Application Support/OpenVPN Connect", "~/Library/Logs/OpenVPN Connect", "~/Library/Preferences/org.openvpn.client.app.helper.plist", "~/Library/Preferences/org.openvpn.client.app.plist", "~/Library/Saved Application State/org.openvpn.client.app.savedState", - ], - script: { - executable: "security", - args: ["delete-keychain", "openvpn.keychain-db"], - } + ] end diff --git a/Casks/o/openzfs.rb b/Casks/o/openzfs.rb index 35c0411fa9..ca7228ecb0 100644 --- a/Casks/o/openzfs.rb +++ b/Casks/o/openzfs.rb @@ -102,14 +102,14 @@ cask "openzfs" do system "sudo", "/usr/local/zfs/bin/zpool", "export", "-af" end - uninstall pkgutil: "org.openzfsonosx.zfs", - launchctl: [ + uninstall launchctl: [ "org.openzfsonosx.InvariantDisks", "org.openzfsonosx.zconfigd", "org.openzfsonosx.zed", "org.openzfsonosx.zpool-import", "org.openzfsonosx.zpool-import-all", - ] + ], + pkgutil: "org.openzfsonosx.zfs" caveats do kext diff --git a/Casks/o/osxfuse.rb b/Casks/o/osxfuse.rb index 6f0e9c0813..401e5290cd 100644 --- a/Casks/o/osxfuse.rb +++ b/Casks/o/osxfuse.rb @@ -19,12 +19,12 @@ cask "osxfuse" do set_ownership ["/usr/local/include", "/usr/local/lib"] end - uninstall pkgutil: [ + uninstall kext: "com.github.osxfuse.filesystems.osxfuse", + pkgutil: [ "com.github.osxfuse.pkg.Core", "com.github.osxfuse.pkg.MacFUSE", "com.github.osxfuse.pkg.PrefPane", - ], - kext: "com.github.osxfuse.filesystems.osxfuse" + ] zap trash: "~/Library/Caches/com.github.osxfuse.OSXFUSEPrefPane" diff --git a/Casks/p/paragon-extfs.rb b/Casks/p/paragon-extfs.rb index 133b9e3f0f..70955e9975 100644 --- a/Casks/p/paragon-extfs.rb +++ b/Casks/p/paragon-extfs.rb @@ -18,14 +18,14 @@ cask "paragon-extfs" do installer manual: "FSInstaller.app" - uninstall kext: "com.paragon-software.filesystems.extfs", - launchctl: "com.paragon-software.extfs*", - pkgutil: "com.paragon-software.pkg.extfs", + uninstall launchctl: "com.paragon-software.extfs*", quit: "com.paragon-software.extfs*", signal: [ ["KILL", "com.paragon-software.extfs.FSMenuApp"], ["KILL", "com.paragon-software.extfs.notification-agent"], - ] + ], + kext: "com.paragon-software.filesystems.extfs", + pkgutil: "com.paragon-software.pkg.extfs" zap trash: [ "~/Library/Application Support/com.paragon-software.extfs.*", diff --git a/Casks/p/paragon-ntfs.rb b/Casks/p/paragon-ntfs.rb index 324d3c68e7..fc3f29175b 100644 --- a/Casks/p/paragon-ntfs.rb +++ b/Casks/p/paragon-ntfs.rb @@ -16,14 +16,14 @@ cask "paragon-ntfs" do installer manual: "FSInstaller.app" - uninstall kext: "com.paragon-software.filesystems.ntfs", - launchctl: "com.paragon-software.ntfs*", - pkgutil: "com.paragon-software.pkg.ntfs", + uninstall launchctl: "com.paragon-software.ntfs*", quit: "com.paragon-software.ntfs*", signal: [ ["KILL", "com.paragon-software.ntfs.FSMenuApp"], ["KILL", "com.paragon-software.ntfs.notification-agent"], - ] + ], + kext: "com.paragon-software.filesystems.ntfs", + pkgutil: "com.paragon-software.pkg.ntfs" zap trash: [ "~/Library/Application Support/com.paragon-software.ntfs.*", diff --git a/Casks/p/parallels-client.rb b/Casks/p/parallels-client.rb index 15f1d220c9..f030bc6ca6 100644 --- a/Casks/p/parallels-client.rb +++ b/Casks/p/parallels-client.rb @@ -19,6 +19,6 @@ cask "parallels-client" do pkg "RasClient-Mac-Notarized-#{version.csv.first.major_minor_patch}-#{version.csv.second}.pkg" - uninstall pkgutil: "com.2X.Client.Mac", - quit: "com.2X.Client.Mac" + uninstall quit: "com.2X.Client.Mac", + pkgutil: "com.2X.Client.Mac" end diff --git a/Casks/p/parallels-toolbox.rb b/Casks/p/parallels-toolbox.rb index 46a9be46d5..d2b98f46f3 100644 --- a/Casks/p/parallels-toolbox.rb +++ b/Casks/p/parallels-toolbox.rb @@ -17,8 +17,8 @@ cask "parallels-toolbox" do installer manual: "Install Parallels Toolbox.app" - uninstall delete: "/Applications/Parallels Toolbox.app", - signal: ["TERM", "com.parallels.toolbox"] + uninstall signal: ["TERM", "com.parallels.toolbox"], + delete: "/Applications/Parallels Toolbox.app" zap trash: [ "~/Library/Application Scripts/*.com.parallels.toolbox", diff --git a/Casks/p/parallels.rb b/Casks/p/parallels.rb index d3ffc90982..b56628af12 100644 --- a/Casks/p/parallels.rb +++ b/Casks/p/parallels.rb @@ -46,7 +46,8 @@ cask "parallels" do set_ownership "#{appdir}/Parallels Desktop.app" end - uninstall delete: [ + uninstall signal: ["TERM", "com.parallels.desktop.console"], + delete: [ "/usr/local/bin/prl_convert", "/usr/local/bin/prl_disk_tool", "/usr/local/bin/prl_perf_ctl", @@ -55,8 +56,7 @@ cask "parallels" do "/usr/local/bin/prlexec", "/usr/local/bin/prlsrvctl", "/Library/Preferences/Parallels", - ], - signal: ["TERM", "com.parallels.desktop.console"] + ] zap trash: [ "~/.parallels_settings", diff --git a/Casks/p/parsec.rb b/Casks/p/parsec.rb index 4151572f26..0978cbe503 100644 --- a/Casks/p/parsec.rb +++ b/Casks/p/parsec.rb @@ -18,8 +18,8 @@ cask "parsec" do set_ownership "~/.parsec" end - uninstall pkgutil: "tv.parsec.www", - quit: "tv.parsec.www" + uninstall quit: "tv.parsec.www", + pkgutil: "tv.parsec.www" zap trash: "~/.parsec" end diff --git a/Casks/p/perimeter81.rb b/Casks/p/perimeter81.rb index 4f39b5cc53..020b2e3b72 100644 --- a/Casks/p/perimeter81.rb +++ b/Casks/p/perimeter81.rb @@ -15,15 +15,15 @@ cask "perimeter81" do pkg "Perimeter81_#{version}.pkg" - uninstall pkgutil: "com.safervpn.osx.smb", - signal: ["TERM", "com.safervpn.osx.smb"], - launchctl: [ + uninstall launchctl: [ "com.perimeter81.osx.HelperTool", "com.perimeter81.Perimeter81", "com.perimeter81d", "com.perimeter81d.app", "system/com.perimeter81d", ], + signal: ["TERM", "com.safervpn.osx.smb"], + pkgutil: "com.safervpn.osx.smb", delete: [ "/Library/PrivilegedHelperTools/com.perimeter81.osx.HelperTool", "/Library/PrivilegedHelperTools/com.perimeter81d.app/Contents/MacOS/com.perimeter81d", diff --git a/Casks/p/phoenix.rb b/Casks/p/phoenix.rb index 64bc339f96..662568a585 100644 --- a/Casks/p/phoenix.rb +++ b/Casks/p/phoenix.rb @@ -12,11 +12,11 @@ cask "phoenix" do app "Phoenix.app" - uninstall login_item: "Phoenix", - quit: [ + uninstall quit: [ "org.khirviko.Phoenix", "org.khirviko.Phoenix.Launcher", - ] + ], + login_item: "Phoenix" zap trash: [ "~/Library/Application Scripts/org.khirviko.Phoenix.Launcher", diff --git a/Casks/p/pivy.rb b/Casks/p/pivy.rb index e60396b3c8..a8c5211739 100644 --- a/Casks/p/pivy.rb +++ b/Casks/p/pivy.rb @@ -9,9 +9,9 @@ cask "pivy" do pkg "pivy-#{version}-macos12.pkg" - uninstall pkgutil: "net.cooperi.pivy", - launchctl: "net.cooperi.pivy-agent", - quit: "net.cooperi.pivy-agent" + uninstall launchctl: "net.cooperi.pivy-agent", + quit: "net.cooperi.pivy-agent", + pkgutil: "net.cooperi.pivy" # No zap stanza required diff --git a/Casks/p/playdate-simulator.rb b/Casks/p/playdate-simulator.rb index a90dac279a..67da84a881 100644 --- a/Casks/p/playdate-simulator.rb +++ b/Casks/p/playdate-simulator.rb @@ -24,8 +24,8 @@ cask "playdate-simulator" do end uninstall pkgutil: "date.play.sdk", - trash: "~/Developer/PlaydateSDK", delete: "/usr/local/playdate", + trash: "~/Developer/PlaydateSDK", rmdir: "~/Developer" zap trash: "~/.Playdate" diff --git a/Casks/p/playmemories-home.rb b/Casks/p/playmemories-home.rb index 9b55eab210..567128f1e9 100644 --- a/Casks/p/playmemories-home.rb +++ b/Casks/p/playmemories-home.rb @@ -20,11 +20,11 @@ cask "playmemories-home" do pkg "PMH_INST.pkg" - uninstall pkgutil: "com.sony.pkg.PMHInstaller", - launchctl: [ + uninstall launchctl: [ "com.sony.SonyAutoLauncher.agent", "com.sony.WirelessAutoImportLauncher.agent", - ] + ], + pkgutil: "com.sony.pkg.PMHInstaller" zap trash: [ "/Applications/PMHMac.app", diff --git a/Casks/p/plex-media-server.rb b/Casks/p/plex-media-server.rb index de5c0b3044..9c58a8b314 100644 --- a/Casks/p/plex-media-server.rb +++ b/Casks/p/plex-media-server.rb @@ -21,8 +21,8 @@ cask "plex-media-server" do app "Plex Media Server.app" binary "#{appdir}/Plex Media Server.app/Contents/MacOS/Plex Media Scanner", target: "plexms" - uninstall quit: "com.plexapp.plexmediaserver", - launchctl: "com.plexapp.mediaserver" + uninstall launchctl: "com.plexapp.mediaserver", + quit: "com.plexapp.plexmediaserver" zap trash: [ "~/Library/Application Support/Plex Media Server/", diff --git a/Casks/p/powerpanel.rb b/Casks/p/powerpanel.rb index d418a0db37..645ebd606c 100644 --- a/Casks/p/powerpanel.rb +++ b/Casks/p/powerpanel.rb @@ -17,23 +17,23 @@ cask "powerpanel" do pkg "PPP_Mac_v#{version}.pkg" - uninstall pkgutil: [ - "com.cpsww.ppupsd", - "com.cyberpower.powerpanelpersonal.ppp", - ], - launchctl: [ + uninstall launchctl: [ "com.cpsww.ppupsd", "com.cyberpower.powerpanel-personal.client", "com.cyberpower.powerpanel-personal.daemon", ], + pkgutil: [ + "com.cpsww.ppupsd", + "com.cyberpower.powerpanelpersonal.ppp", + ], delete: "/Applications/PowerPanel Personal.app" - zap trash: [ - "~/Library/Preferences/PowerPanel Personal.plist", - "~/Library/Saved Application State/PowerPanel Personal.savedState", - ], - delete: [ + zap delete: [ "/Library/LaunchAgents/com.cyberpower.powerpanel-personal.client.plist", "/Library/LaunchDaemons/com.cyberpower.powerpanel-personal.daemon.plist", + ], + trash: [ + "~/Library/Preferences/PowerPanel Personal.plist", + "~/Library/Saved Application State/PowerPanel Personal.savedState", ] end diff --git a/Casks/p/prezi-video.rb b/Casks/p/prezi-video.rb index 5860984c62..8e3a903924 100644 --- a/Casks/p/prezi-video.rb +++ b/Casks/p/prezi-video.rb @@ -17,8 +17,8 @@ cask "prezi-video" do pkg "Prezi_Video.pkg" - uninstall quit: "com.prezi.PreziCast", - launchctl: "com.prezi.prezivideo.vcam.assistant", + uninstall launchctl: "com.prezi.prezivideo.vcam.assistant", + quit: "com.prezi.PreziCast", pkgutil: [ "com.prezi.PreziCast", "com.prezi.prezivideo.vcam.plugin", diff --git a/Casks/p/pritunl.rb b/Casks/p/pritunl.rb index c0af652142..e2277bf33b 100644 --- a/Casks/p/pritunl.rb +++ b/Casks/p/pritunl.rb @@ -13,12 +13,12 @@ cask "pritunl" do pkg "Pritunl#{arch}.pkg" - uninstall pkgutil: "com.pritunl.pkg.Pritunl", - launchctl: [ + uninstall launchctl: [ "com.pritunl.client", "com.pritunl.service", ], signal: ["TERM", "com.electron.pritunl"], + pkgutil: "com.pritunl.pkg.Pritunl", delete: "/Applications/Pritunl.app" zap trash: [ diff --git a/Casks/p/private-eye.rb b/Casks/p/private-eye.rb index 05c22d5a28..9799afefcb 100644 --- a/Casks/p/private-eye.rb +++ b/Casks/p/private-eye.rb @@ -20,8 +20,8 @@ cask "private-eye" do args: ["-b", "com.radiosilenceapp.nke.PrivateEye"], must_succeed: false, }, + launchctl: "com.radiosilenceapp.nke.PrivateEye", quit: "com.radiosilenceapp.PrivateEye", kext: "com.radiosilenceapp.nke.PrivateEye", - pkgutil: "com.radiosilenceapp.privateEye.*", - launchctl: "com.radiosilenceapp.nke.PrivateEye" + pkgutil: "com.radiosilenceapp.privateEye.*" end diff --git a/Casks/p/private-internet-access.rb b/Casks/p/private-internet-access.rb index b37c8848ac..3ce9f155e7 100644 --- a/Casks/p/private-internet-access.rb +++ b/Casks/p/private-internet-access.rb @@ -20,14 +20,14 @@ cask "private-internet-access" do sudo: true, } - uninstall quit: "com.privateinternetaccess.vpn", + uninstall launchctl: [ + "com.privateinternetaccess.vpn.installhelper", + "com.privateinternetaccess.vpn.daemon", + ], + quit: "com.privateinternetaccess.vpn", delete: [ "/Applications/Private Internet Access.app", "/usr/local/bin/piactl", - ], - launchctl: [ - "com.privateinternetaccess.vpn.installhelper", - "com.privateinternetaccess.vpn.daemon", ] # The uninstall script should only be used with --zap because it removes all preference files diff --git a/Casks/p/prolific-pl2303.rb b/Casks/p/prolific-pl2303.rb index ac1175b87f..fa525aae20 100644 --- a/Casks/p/prolific-pl2303.rb +++ b/Casks/p/prolific-pl2303.rb @@ -14,13 +14,13 @@ cask "prolific-pl2303" do pkg "PL2303HXD&G_Mac Driver_v#{version}.pkg" - uninstall kext: "com.prolific.driver.PL2303", + uninstall quit: "com.prolific.PLVCDriver", + kext: "com.prolific.driver.PL2303", pkgutil: [ "com.Susteen.driver.PL2303", "com.prolific.driver.PL2303", "com.prolific.pkg.PLVCDriver", ], - quit: "com.prolific.PLVCDriver", delete: [ "/Library/Extensions/ProlificUsbSerial.kext", "/var/db/receipts/*PL2303*.*", diff --git a/Casks/p/proxyman.rb b/Casks/p/proxyman.rb index 01930e1146..a39cfe10ec 100644 --- a/Casks/p/proxyman.rb +++ b/Casks/p/proxyman.rb @@ -29,8 +29,8 @@ cask "proxyman" do end end - uninstall quit: "com.proxyman.NSProxy", - launchctl: "com.proxyman.NSProxy.HelperTool", + uninstall launchctl: "com.proxyman.NSProxy.HelperTool", + quit: "com.proxyman.NSProxy", delete: "/Library/PrivilegedHelperTools/com.proxyman.NSProxy.HelperTool" zap trash: [ diff --git a/Casks/p/ptpwebcam.rb b/Casks/p/ptpwebcam.rb index b2ec901a65..37aea2a6c7 100644 --- a/Casks/p/ptpwebcam.rb +++ b/Casks/p/ptpwebcam.rb @@ -15,7 +15,11 @@ cask "ptpwebcam" do pkg "PTP_Webcam-v#{version}.pkg" - uninstall pkgutil: [ + uninstall launchctl: [ + "org.ptpwebcam.PtpWebcamAgent", + "org.ptpwebcam.PtpWebcamAssistant", + ], + pkgutil: [ "org.ptpwebcam.pkg.EnableChrome", "org.ptpwebcam.pkg.EnableSkype", "org.ptpwebcam.pkg.EnableTeams", @@ -23,10 +27,6 @@ cask "ptpwebcam" do "org.ptpwebcam.pkg.PTPWebcam", "org.ptpwebcam.pkg.RemoveEOSWebcam", ], - launchctl: [ - "org.ptpwebcam.PtpWebcamAgent", - "org.ptpwebcam.PtpWebcamAssistant", - ], delete: [ "/Library/CoreMediaIO/Plug-ins/DAL/PTPWebcamDALPlugin.plugin", "/Library/LaunchDaemons/org.ptpwebcam.PtpWebcamAssistant.plist", diff --git a/Casks/q/qldds.rb b/Casks/q/qldds.rb index 3eeb6fd794..f46606a1d3 100644 --- a/Casks/q/qldds.rb +++ b/Casks/q/qldds.rb @@ -15,6 +15,6 @@ cask "qldds" do pkg "QLdds_#{version.no_dots}.pkg" - uninstall pkgutil: "uk.org.marginal.qldds", - launchctl: "uk.org.marginal.qldds.mdimporter" + uninstall launchctl: "uk.org.marginal.qldds.mdimporter", + pkgutil: "uk.org.marginal.qldds" end diff --git a/Casks/q/qsync-client.rb b/Casks/q/qsync-client.rb index eee5c579ad..170f81c69b 100644 --- a/Casks/q/qsync-client.rb +++ b/Casks/q/qsync-client.rb @@ -14,11 +14,11 @@ cask "qsync-client" do installer manual: "Qsync Client.pkg" - uninstall pkgutil: "com.qnap.qsync", - quit: [ + uninstall quit: [ "com.qnap.qsync", "com.qnap.qsync.findersync", - ] + ], + pkgutil: "com.qnap.qsync" zap trash: [ "~/Library/Application Scripts/com.qnap.qsync", diff --git a/Casks/q/qutebrowser.rb b/Casks/q/qutebrowser.rb index 46067c8285..3d3241de64 100644 --- a/Casks/q/qutebrowser.rb +++ b/Casks/q/qutebrowser.rb @@ -20,12 +20,12 @@ cask "qutebrowser" do EOS end - zap rmdir: "~/.qutebrowser", - trash: [ + zap trash: [ "~/Library/Application Support/qutebrowser", "~/Library/Caches/qutebrowser", "~/Library/Preferences/qutebrowser", - ] + ], + rmdir: "~/.qutebrowser" caveats do requires_rosetta diff --git a/Casks/r/r.rb b/Casks/r/r.rb index 2772f083fd..79ccfd1d8c 100644 --- a/Casks/r/r.rb +++ b/Casks/r/r.rb @@ -84,7 +84,8 @@ cask "r" do "/usr/bin/Rscript", ] - zap trash: [ + zap delete: "/Library/Frameworks/R.Framework", + trash: [ "~/.R", "~/.Rapp.history", "~/.RData", @@ -92,8 +93,7 @@ cask "r" do "~/.Rprofile", "~/Library/R", "~/Library/Caches/org.R-project.R", - ], - delete: "/Library/Frameworks/R.Framework" + ] caveats do files_in_usr_local diff --git a/Casks/r/radio-silence.rb b/Casks/r/radio-silence.rb index 93d689569a..167784ad38 100644 --- a/Casks/r/radio-silence.rb +++ b/Casks/r/radio-silence.rb @@ -22,14 +22,14 @@ cask "radio-silence" do args: ["-b", "com.radiosilenceapp.nke.filter"], must_succeed: false, }, - quit: "com.radiosilenceapp.client", - kext: "com.radiosilenceapp.nke.filter", - pkgutil: "com.radiosilenceapp.*", launchctl: [ "com.radiosilenceapp.trial", "com.radiosilenceapp.agent", "com.radiosilenceapp.nke", - ] + ], + quit: "com.radiosilenceapp.client", + kext: "com.radiosilenceapp.nke.filter", + pkgutil: "com.radiosilenceapp.*" zap trash: "~/Library/Application Support/Radio Silence" end diff --git a/Casks/r/rancher.rb b/Casks/r/rancher.rb index abdcf85966..b8a0f71d8a 100644 --- a/Casks/r/rancher.rb +++ b/Casks/r/rancher.rb @@ -21,13 +21,13 @@ cask "rancher" do app "Rancher Desktop.app" - uninstall delete: [ + uninstall quit: "io.rancherdesktop.app", + delete: [ "/opt/rancher-desktop", "/private/etc/sudoers.d/zzzzz-rancher-desktop-lima", # zzzzz is not a typo "/private/var/run/docker.sock", "/private/var/run/rancher-desktop-*", - ], - quit: "io.rancherdesktop.app" + ] zap trash: [ "~/.kuberlr", diff --git a/Casks/r/red-canary-mac-monitor.rb b/Casks/r/red-canary-mac-monitor.rb index 9bd832c465..3426d12836 100644 --- a/Casks/r/red-canary-mac-monitor.rb +++ b/Casks/r/red-canary-mac-monitor.rb @@ -14,12 +14,12 @@ cask "red-canary-mac-monitor" do # The uninstall script requires user input to remove an installed system # extension. It is expected that the uninstall CI will time out and fail. - uninstall pkgutil: "com.redcanary.agent", - script: { + uninstall script: { executable: "/Applications/Red Canary Mac Monitor.app/Contents/SharedSupport/uninstall.sh", must_succeed: false, sudo: true, - } + }, + pkgutil: "com.redcanary.agent" zap trash: [ "~/Library/Application Support/Red Canary Mac Monitor", diff --git a/Casks/r/remotix-agent.rb b/Casks/r/remotix-agent.rb index 3a1910a130..7c42c2d49f 100644 --- a/Casks/r/remotix-agent.rb +++ b/Casks/r/remotix-agent.rb @@ -22,22 +22,22 @@ cask "remotix-agent" do pkg "RemotixAgent-#{version.csv.first}-#{version.csv.second}.pkg" - uninstall pkgutil: [ - "com.nulana.rxagentmac.daemon", - "com.nulana.rxagentmac", - ], - signal: [ - ["KILL", "com.nulana.rxagentmac.user"], - ["KILL", "com.nulana.rxagentmac"], - ], - launchctl: [ + uninstall launchctl: [ "com.nulana.rxagentmac.daemon", "com.nulana.rxagentmac.gui", "com.nulana.rxagentmac.rc", "com.nulana.rxagentmac.user", ], - login_item: "Remotix Agent", quit: "com.nulana.rxagentmac", + signal: [ + ["KILL", "com.nulana.rxagentmac.user"], + ["KILL", "com.nulana.rxagentmac"], + ], + login_item: "Remotix Agent", + pkgutil: [ + "com.nulana.rxagentmac.daemon", + "com.nulana.rxagentmac", + ], delete: [ "/Library/LaunchAgents/com.nulana.rxagentmac.user.plist", "/Library/LaunchDaemons/com.nulana.rxagentmac.daemon.plist", diff --git a/Casks/r/resolume-arena.rb b/Casks/r/resolume-arena.rb index 5bc8c60014..cce3c59405 100644 --- a/Casks/r/resolume-arena.rb +++ b/Casks/r/resolume-arena.rb @@ -18,7 +18,9 @@ cask "resolume-arena" do pkg "Resolume Arena Installer.pkg" - uninstall pkgutil: [ + uninstall launchctl: "com.resolume.arena", + signal: ["TERM", "com.resolume.arena"], + pkgutil: [ "com.resolume.pkg.ResolumeArena.*", "com.resolume.pkg.ResolumeDXV", "com.resolume.pkg.ResolumeQuickLook", @@ -27,9 +29,7 @@ cask "resolume-arena" do "com.resolume.pkg.ResolumeCommon", "com.resolume.pkg.ResolumeWire", ], - delete: "/Applications/Resolume Arena #{version.major}", - signal: ["TERM", "com.resolume.arena"], - launchctl: "com.resolume.arena" + delete: "/Applications/Resolume Arena #{version.major}" zap pkgutil: [ "com.resolume.pkg.ResolumeDXV", diff --git a/Casks/r/ringcentral-meetings.rb b/Casks/r/ringcentral-meetings.rb index 7249bc1fcd..c9f1b462f3 100644 --- a/Casks/r/ringcentral-meetings.rb +++ b/Casks/r/ringcentral-meetings.rb @@ -14,10 +14,10 @@ cask "ringcentral-meetings" do pkg "RCMeetingsClientSetup.pkg" - uninstall delete: "/Applications/RingCentral Meetings.app", + uninstall quit: "us.zoom.RingCentralOpener", + signal: ["KILL", "us.zoom.ringcentral"], pkgutil: "us.zoom.pkg.ringcentral", - quit: "us.zoom.RingCentralOpener", - signal: ["KILL", "us.zoom.ringcentral"] + delete: "/Applications/RingCentral Meetings.app" zap trash: [ "~/Desktop/RingCentral Meetings", diff --git a/Casks/r/ringcentral.rb b/Casks/r/ringcentral.rb index 5b3f3a1751..cc51683e48 100644 --- a/Casks/r/ringcentral.rb +++ b/Casks/r/ringcentral.rb @@ -16,9 +16,9 @@ cask "ringcentral" do pkg "RingCentral#{arch}.pkg" - uninstall delete: "/Applications/RingCentral.app", - quit: "RingCentral", - pkgutil: "com.ringcentral.glip" + uninstall quit: "RingCentral", + pkgutil: "com.ringcentral.glip", + delete: "/Applications/RingCentral.app" zap trash: [ "~/Library/Application Support/RingCentral", diff --git a/Casks/s/salt.rb b/Casks/s/salt.rb index fde3be9bf7..b3c0ad0b32 100644 --- a/Casks/s/salt.rb +++ b/Casks/s/salt.rb @@ -17,14 +17,14 @@ cask "salt" do pkg "salt-#{version}-py3-#{arch}.pkg" - uninstall pkgutil: [ - "com.saltstack.salt", - ], - launchctl: [ + uninstall launchctl: [ "com.saltstack.salt.api", "com.saltstack.salt.master", "com.saltstack.salt.minion", "com.saltstack.salt.syndic", + ], + pkgutil: [ + "com.saltstack.salt", ] zap trash: "/etc/salt" diff --git a/Casks/s/samsung-portable-ssd-t7.rb b/Casks/s/samsung-portable-ssd-t7.rb index 624f97dba9..f85a92583b 100644 --- a/Casks/s/samsung-portable-ssd-t7.rb +++ b/Casks/s/samsung-portable-ssd-t7.rb @@ -19,11 +19,11 @@ cask "samsung-portable-ssd-t7" do pkg "SamsungPortableSSD_Setup_Mac_#{version.csv.second}.pkg" - uninstall quit: [ + uninstall launchctl: "com.samsung.portablessdplus.mon", + quit: [ "com.samsung.portablessdplus.software", "/Applications/SamsungPortableSSD_#{version.csv.second}.app", ], - launchctl: "com.samsung.portablessdplus.mon", kext: "com.samsung.portablessd.driver", pkgutil: [ "com.samsung.portablessdplusuniversal.softwarepkg", diff --git a/Casks/s/santa.rb b/Casks/s/santa.rb index 855db1dc88..3cd1019d76 100644 --- a/Casks/s/santa.rb +++ b/Casks/s/santa.rb @@ -14,19 +14,19 @@ cask "santa" do pkg "santa-#{version}.pkg" - uninstall delete: [ - "/Applications/Santa.app", - "/usr/local/bin/santactl", - ], - kext: "com.google.santa-driver", - launchctl: [ + uninstall launchctl: [ "com.google.santa", "com.google.santa.bundleservice", "com.google.santa.metricservice", "com.google.santa.syncservice", "com.google.santad", ], - pkgutil: "com.google.santa" + kext: "com.google.santa-driver", + pkgutil: "com.google.santa", + delete: [ + "/Applications/Santa.app", + "/usr/local/bin/santactl", + ] # No zap stanza required diff --git a/Casks/s/screens-connect.rb b/Casks/s/screens-connect.rb index 3846318c50..1e541aa32e 100644 --- a/Casks/s/screens-connect.rb +++ b/Casks/s/screens-connect.rb @@ -19,11 +19,11 @@ cask "screens-connect" do # Uninstall script can fail when trying to remove legacy PKGIDS # Original discussion: https://github.com/Homebrew/homebrew-cask/pull/8833 - uninstall quit: "com.edovia.Screens-Connect", - launchctl: [ + uninstall launchctl: [ "com.edovia.Screens-Connect.launcher", "com.edovia.screens.connect", ], + quit: "com.edovia.Screens-Connect", script: { executable: "#{appdir}/Screens Connect.app/Contents/Resources/sc-uninstaller.tool", must_succeed: false, diff --git a/Casks/s/send-to-kindle.rb b/Casks/s/send-to-kindle.rb index 5c99d99c63..a489eceb5f 100644 --- a/Casks/s/send-to-kindle.rb +++ b/Casks/s/send-to-kindle.rb @@ -16,8 +16,8 @@ cask "send-to-kindle" do pkg "SendToKindleForMac-installer.pkg" uninstall launchctl: "com.amazon.sendtokindle.launcher", - pkgutil: "com.amazon.SendToKindleMacInstaller.pkg", - quit: "com.amazon.SendToKindle" + quit: "com.amazon.SendToKindle", + pkgutil: "com.amazon.SendToKindleMacInstaller.pkg" zap trash: [ "~/Library/Application Support/Amazon/SendToKindle", diff --git a/Casks/s/sensei.rb b/Casks/s/sensei.rb index fb797ff2a6..59cd12f1c0 100644 --- a/Casks/s/sensei.rb +++ b/Casks/s/sensei.rb @@ -18,13 +18,13 @@ cask "sensei" do app "Sensei.app" - uninstall delete: [ + uninstall launchctl: "org.cindori.SenseiTool", + delete: [ "/Library/LaunchAgents/org.cindori.SenseiMonitor.plist", "/Library/LaunchDaemons/org.cindori.SenseiDaemon.plist", "/Library/LaunchDaemons/org.cindori.SenseiHelper.plist", "/Library/PrivilegedHelperTools/org.cindori.SenseiTool", - ], - launchctl: "org.cindori.SenseiTool" + ] zap trash: [ "~/Library/Application Support/org.cindori.Sensei", diff --git a/Casks/s/serviio.rb b/Casks/s/serviio.rb index aaacc1b4d1..76a0aa8833 100644 --- a/Casks/s/serviio.rb +++ b/Casks/s/serviio.rb @@ -14,13 +14,13 @@ cask "serviio" do pkg "Serviio-#{version}.pkg" - uninstall pkgutil: [ + uninstall launchctl: "org.serviio.server", + pkgutil: [ "org.serviio.pkg.autostart", "org.serviio.pkg.JRE", "org.serviio.pkg.ServiioConsole", "org.serviio.pkg.Serviio", - ], - launchctl: "org.serviio.server" + ] zap trash: [ "/Library/Application Support/Serviio", diff --git a/Casks/s/shadowsocksx-ng-r.rb b/Casks/s/shadowsocksx-ng-r.rb index a33f411043..1ec2a5447b 100644 --- a/Casks/s/shadowsocksx-ng-r.rb +++ b/Casks/s/shadowsocksx-ng-r.rb @@ -16,8 +16,7 @@ cask "shadowsocksx-ng-r" do system_command "#{appdir}/ShadowsocksX-NG-R8.app/Contents/Resources/install_helper.sh" end - uninstall delete: "/Library/Application Support/ShadowsocksX-NG", - launchctl: [ + uninstall launchctl: [ "com.qiuyuzhou.shadowsocksX-NG.http", "com.qiuyuzhou.shadowsocksX-NG.kcptun", "com.qiuyuzhou.shadowsocksX-NG.local", @@ -27,7 +26,8 @@ cask "shadowsocksx-ng-r" do script: { executable: "/Library/Application Support/ShadowsocksX-NG/proxy_conf_helper", args: ["--mode", "off"], - } + }, + delete: "/Library/Application Support/ShadowsocksX-NG" zap trash: [ "~/.ShadowsocksX-NG", diff --git a/Casks/s/shadowsocksx-ng.rb b/Casks/s/shadowsocksx-ng.rb index a6d76eb922..acb86c0037 100644 --- a/Casks/s/shadowsocksx-ng.rb +++ b/Casks/s/shadowsocksx-ng.rb @@ -12,8 +12,7 @@ cask "shadowsocksx-ng" do app "ShadowsocksX-NG.app" - uninstall delete: "/Library/Application Support/ShadowsocksX-NG", - launchctl: [ + uninstall launchctl: [ "com.qiuyuzhou.shadowsocksX-NG.http", "com.qiuyuzhou.shadowsocksX-NG.kcptun", "com.qiuyuzhou.shadowsocksX-NG.local", @@ -24,7 +23,8 @@ cask "shadowsocksx-ng" do executable: "#{appdir}/ShadowsocksX-NG.app/Contents/Resources/proxy_conf_helper", args: ["--mode", "off"], sudo: true, - } + }, + delete: "/Library/Application Support/ShadowsocksX-NG" zap trash: [ "~/.ShadowsocksX-NG", diff --git a/Casks/s/shutter-encoder.rb b/Casks/s/shutter-encoder.rb index f536aa12ca..ee7859f972 100644 --- a/Casks/s/shutter-encoder.rb +++ b/Casks/s/shutter-encoder.rb @@ -18,8 +18,8 @@ cask "shutter-encoder" do pkg "Shutter Encoder #{version} #{arch}.pkg" uninstall launchctl: "application.com.paulpacifico.shutterencoder.*", - pkgutil: "com.paulpacifico.shutterencoder", - quit: "com.paulpacifico.shutterencoder" + quit: "com.paulpacifico.shutterencoder", + pkgutil: "com.paulpacifico.shutterencoder" zap trash: "~/Documents/Shutter Encoder" end diff --git a/Casks/s/skyfonts.rb b/Casks/s/skyfonts.rb index 189dd1c459..5a96c369b3 100644 --- a/Casks/s/skyfonts.rb +++ b/Casks/s/skyfonts.rb @@ -14,10 +14,10 @@ cask "skyfonts" do installer manual: "Install SkyFonts.app" - uninstall quit: [ + uninstall launchctl: "com.mti.Monotype-SkyFontsHelper", + quit: [ "com.mti.Monotype-SkyFonts", "com.mti.Monotype-SkyFontsHelper", ], - launchctl: "com.mti.Monotype-SkyFontsHelper", delete: "/Applications/Skyfonts" end diff --git a/Casks/s/skype-for-business.rb b/Casks/s/skype-for-business.rb index 855ddf4674..c70b3a47b2 100644 --- a/Casks/s/skype-for-business.rb +++ b/Casks/s/skype-for-business.rb @@ -25,13 +25,13 @@ cask "skype-for-business" do }, ] - uninstall delete: "/Applications/Skype for Business.app", + uninstall quit: "com.microsoft.autoupdate2", + login_item: "Skype for Business", pkgutil: [ "com.microsoft.SkypeForBusiness", "com.microsoft.SkypeForBusiness.MeetingJoinPlugin", ], - login_item: "Skype for Business", - quit: "com.microsoft.autoupdate2" + delete: "/Applications/Skype for Business.app" zap trash: [ "/Library/Internet Plug-Ins/MeetingJoinPlugin.plugin", diff --git a/Casks/s/softube-central.rb b/Casks/s/softube-central.rb index 75f472e43a..c7f95c9093 100644 --- a/Casks/s/softube-central.rb +++ b/Casks/s/softube-central.rb @@ -18,7 +18,11 @@ cask "softube-central" do pkg "Softube Central-#{version}-universal.pkg" - uninstall quit: [ + uninstall launchctl: [ + "com.paceap.eden.licensed", + "com.paceap.eden.licensed.agent", + ], + quit: [ "com.softube.Console1OSD_Release", "org.softube.com.softubecentral", ], @@ -28,10 +32,6 @@ cask "softube-central" do "com.paceap.pkg.eden.licensed", "com.softube.installerdaemon.helper", "org.softube.com.softubecentral", - ], - launchctl: [ - "com.paceap.eden.licensed", - "com.paceap.eden.licensed.agent", ] zap trash: [ diff --git a/Casks/s/sol.rb b/Casks/s/sol.rb index 0ea2b2d523..fa5dac63b0 100644 --- a/Casks/s/sol.rb +++ b/Casks/s/sol.rb @@ -17,8 +17,8 @@ cask "sol" do app "Sol.app" - uninstall quit: "com.ospfranco.sol", - launchctl: "com.ospfranco.sol-LaunchAtLoginHelper" + uninstall launchctl: "com.ospfranco.sol-LaunchAtLoginHelper", + quit: "com.ospfranco.sol" zap trash: [ "~/Library/Application Scripts/com.ospfranco.sol-LaunchAtLoginHelper", diff --git a/Casks/s/sonarr-menu.rb b/Casks/s/sonarr-menu.rb index fa94d110c1..bc3fcfa46d 100644 --- a/Casks/s/sonarr-menu.rb +++ b/Casks/s/sonarr-menu.rb @@ -13,6 +13,6 @@ cask "sonarr-menu" do app "Sonarr-Menu.app" - uninstall quit: "tv.sonarr.Sonarr-Menu", - launchctl: "tv.sonarr.Sonarr-Menu" + uninstall launchctl: "tv.sonarr.Sonarr-Menu", + quit: "tv.sonarr.Sonarr-Menu" end diff --git a/Casks/s/soundboosterlite.rb b/Casks/s/soundboosterlite.rb index 7892343c28..82d19fa478 100644 --- a/Casks/s/soundboosterlite.rb +++ b/Casks/s/soundboosterlite.rb @@ -16,8 +16,8 @@ cask "soundboosterlite" do pkg "SoundBoosterLite.pkg" - uninstall quit: "com.froyosoft.SoundBoosterLite", - launchctl: "com.froyosoft.soundboosterxpc", + uninstall launchctl: "com.froyosoft.soundboosterxpc", + quit: "com.froyosoft.SoundBoosterLite", pkgutil: "com.froyosoft.pkg.SoundBoosterLite" zap trash: [ diff --git a/Casks/s/soundflower.rb b/Casks/s/soundflower.rb index e9206223c2..ff81dd86e9 100644 --- a/Casks/s/soundflower.rb +++ b/Casks/s/soundflower.rb @@ -20,8 +20,8 @@ cask "soundflower" do args: ["-b", "com.Cycling74.driver.Soundflower"], must_succeed: false, }, - pkgutil: "com.cycling74.soundflower.*", - kext: "com.Cycling74.driver.Soundflower" + kext: "com.Cycling74.driver.Soundflower", + pkgutil: "com.cycling74.soundflower.*" caveats do kext diff --git a/Casks/s/soundtoys.rb b/Casks/s/soundtoys.rb index bf28cb1460..06616234bf 100644 --- a/Casks/s/soundtoys.rb +++ b/Casks/s/soundtoys.rb @@ -23,12 +23,12 @@ cask "soundtoys" do pkg "Install Soundtoys #{version.major_minor} Bundle.pkg" - uninstall pkgutil: [ - "com.paceap.pkg.eden.*", - "com.soundtoys.*", - ], - launchctl: [ + uninstall launchctl: [ "com.paceap.eden.licensed", "com.paceap.eden.licensed.agent", + ], + pkgutil: [ + "com.paceap.pkg.eden.*", + "com.soundtoys.*", ] end diff --git a/Casks/s/splashtop-streamer.rb b/Casks/s/splashtop-streamer.rb index 73be0e901b..fc97872948 100644 --- a/Casks/s/splashtop-streamer.rb +++ b/Casks/s/splashtop-streamer.rb @@ -17,14 +17,14 @@ cask "splashtop-streamer" do pkg "Splashtop Streamer.pkg" - uninstall quit: "com.splashtop.Splashtop-Streamer", - launchctl: [ + uninstall launchctl: [ "com.splashtop.streamer", "com.splashtop.streamer-daemon", "com.splashtop.streamer-for-root", "com.splashtop.streamer-for-user", "com.splashtop.streamer-srioframebuffer", ], + quit: "com.splashtop.Splashtop-Streamer", pkgutil: "com.splashtop.Splashtop-Streamer" zap trash: [ diff --git a/Casks/s/spotify.rb b/Casks/s/spotify.rb index 8461392446..f745c9300a 100644 --- a/Casks/s/spotify.rb +++ b/Casks/s/spotify.rb @@ -31,8 +31,8 @@ cask "spotify" do app "Spotify.app" - uninstall quit: "com.spotify.client", - launchctl: "com.spotify.webhelper" + uninstall launchctl: "com.spotify.webhelper", + quit: "com.spotify.client" zap trash: [ "~/Library/Application Support/Spotify", diff --git a/Casks/s/stack.rb b/Casks/s/stack.rb index 26a27c2eca..c53df3e189 100644 --- a/Casks/s/stack.rb +++ b/Casks/s/stack.rb @@ -14,8 +14,8 @@ cask "stack" do app "stack.app" - uninstall login_item: "stack", - signal: ["TERM", "nl.transip.stack"], + uninstall signal: ["TERM", "nl.transip.stack"], + login_item: "stack", pkgutil: "nl.transip.stack" zap trash: [ diff --git a/Casks/s/stats.rb b/Casks/s/stats.rb index 1611b9b63f..303a6a2ad3 100644 --- a/Casks/s/stats.rb +++ b/Casks/s/stats.rb @@ -24,13 +24,13 @@ cask "stats" do uninstall quit: "eu.exelban.Stats" - zap trash: [ + zap delete: "/Library/LaunchDaemons/eu.exelban.Stats.SMC.Helper.plist", + trash: [ "~/Library/Application Scripts/eu.exelban.Stats.LaunchAtLogin", "~/Library/Caches/eu.exelban.Stats", "~/Library/Containers/eu.exelban.Stats.LaunchAtLogin", "~/Library/Cookies/eu.exelban.Stats.binarycookies", "~/Library/HTTPStorages/eu.exelban.Stats", "~/Library/Preferences/eu.exelban.Stats.plist", - ], - delete: "/Library/LaunchDaemons/eu.exelban.Stats.SMC.Helper.plist" + ] end diff --git a/Casks/s/steam.rb b/Casks/s/steam.rb index 60fa8ba3ef..97c0840b5a 100644 --- a/Casks/s/steam.rb +++ b/Casks/s/steam.rb @@ -17,14 +17,14 @@ cask "steam" do app "Steam.app" - uninstall quit: [ + uninstall launchctl: [ + "com.valvesoftware.steamclean", + "com.valvesoftware.steam.ipctool", + ], + quit: [ "com.valvesoftware.steam", "com.valvesoftware.steam.helper", "com.valvesoftware.steam.helper.EH", - ], - launchctl: [ - "com.valvesoftware.steamclean", - "com.valvesoftware.steam.ipctool", ] zap trash: [ diff --git a/Casks/s/steamcmd.rb b/Casks/s/steamcmd.rb index ca635dd647..5bc288d0f7 100644 --- a/Casks/s/steamcmd.rb +++ b/Casks/s/steamcmd.rb @@ -35,9 +35,9 @@ cask "steamcmd" do uninstall launchctl: "com.valvesoftware.steamclean" - zap rmdir: [ + zap trash: "~/Library/Application Support/Steam/logs/stderr.txt", + rmdir: [ "~/Library/Application Support/Steam/logs", "~/Library/Application Support/Steam", - ], - trash: "~/Library/Application Support/Steam/logs/stderr.txt" + ] end diff --git a/Casks/s/sunloginclient.rb b/Casks/s/sunloginclient.rb index af0658e78a..918d116c3d 100644 --- a/Casks/s/sunloginclient.rb +++ b/Casks/s/sunloginclient.rb @@ -37,8 +37,8 @@ cask "sunloginclient" do "com.oray.sunlogin.service", "com.oray.sunlogin.startup", ], - pkgutil: "com.oray.sunlogin.macclient", - quit: "com.oray.sunlogin.macclient" + quit: "com.oray.sunlogin.macclient", + pkgutil: "com.oray.sunlogin.macclient" zap delete: "/private/var/log/sunlogin/", trash: [ diff --git a/Casks/s/switchresx.rb b/Casks/s/switchresx.rb index d023bb66e7..33945a10dd 100644 --- a/Casks/s/switchresx.rb +++ b/Casks/s/switchresx.rb @@ -16,19 +16,19 @@ cask "switchresx" do prefpane "SwitchResX Installer.app/Contents/Plugins/SwitchResX.prefPane" - uninstall quit: [ + uninstall launchctl: "fr.madrau.switchresx.helper", + quit: [ "fr.madrau.switchresx.app", "fr.madrau.switchresx.daemon", # note, daemon does not :quit cleanly ], signal: [ - ["INT", "fr.madrau.switchresx.daemon"], + ["INT", "fr.madrau.switchresx.daemon"], ["KILL", "fr.madrau.switchresx.daemon"], ], delete: [ "/Library/ScriptingAdditions/SwitchResX Extensions.osax", "/Library/ScriptingAdditions/SwitchResX Menu.osax", - ], - launchctl: "fr.madrau.switchresx.helper" + ] zap trash: [ "~/Library/Caches/fr.madrau.switchresx.app", diff --git a/Casks/s/synology-cloud-station-backup.rb b/Casks/s/synology-cloud-station-backup.rb index 0118c178dc..f5718c9a34 100644 --- a/Casks/s/synology-cloud-station-backup.rb +++ b/Casks/s/synology-cloud-station-backup.rb @@ -19,15 +19,15 @@ cask "synology-cloud-station-backup" do pkg "Install Cloud Station Backup.pkg" - uninstall quit: [ + uninstall launchctl: "com.synology.Synology Cloud Station Backup", + quit: [ "com.synology.CloudStationBackup", "com.synology.CloudStationBackupUI", ], pkgutil: [ "com.synology.CloudStationBackup", "com.synology.CloudStationBackupUI", - ], - launchctl: "com.synology.Synology Cloud Station Backup" + ] zap trash: "~/Library/Preferences/com.synology.CloudStationBackupUI.plist" end diff --git a/Casks/s/synology-drive.rb b/Casks/s/synology-drive.rb index 7752f577e8..8bc8956dd4 100644 --- a/Casks/s/synology-drive.rb +++ b/Casks/s/synology-drive.rb @@ -19,17 +19,17 @@ cask "synology-drive" do pkg "Install Synology Drive Client.pkg" - uninstall quit: [ + uninstall launchctl: [ + "application.com.synology.CloudStationUI*", + "com.synology.Synology Cloud Station", + ], + quit: [ "io.com.synology.CloudStationUI", "com.synology.CloudStation", "com.synology.CloudStationUI", "com.synology.SynologyDrive.FinderHelper", ], pkgutil: "com.synology.CloudStation", - launchctl: [ - "application.com.synology.CloudStationUI*", - "com.synology.Synology Cloud Station", - ], delete: "/Applications/Synology Drive Client.app" zap trash: [ diff --git a/Casks/s/synology-photo-station-uploader.rb b/Casks/s/synology-photo-station-uploader.rb index 69a3a47403..92455730e6 100644 --- a/Casks/s/synology-photo-station-uploader.rb +++ b/Casks/s/synology-photo-station-uploader.rb @@ -18,16 +18,16 @@ cask "synology-photo-station-uploader" do pkg "SynologyPhotoStationUploader-#{version.after_comma}-Mac-Installer.pkg" - uninstall pkgutil: [ - "com.synology.photostationuploader.installer", - "inc.synology.photostationuploader", - ], - quit: "com.synology.PhotoStationUploader", - launchctl: [ + uninstall launchctl: [ "com.synology.PhotoUploaderFinderSync", "com.synology.PhotoUploaderShellApp", "com.synology.PhotoUploaderUninstaller", "com.synology.SynoSIMBL_RefreshFinder", + ], + quit: "com.synology.PhotoStationUploader", + pkgutil: [ + "com.synology.photostationuploader.installer", + "inc.synology.photostationuploader", ] zap trash: [ diff --git a/Casks/s/synology-surveillance-station-client.rb b/Casks/s/synology-surveillance-station-client.rb index fa1dcb64cb..365ac64a4d 100644 --- a/Casks/s/synology-surveillance-station-client.rb +++ b/Casks/s/synology-surveillance-station-client.rb @@ -15,7 +15,6 @@ cask "synology-surveillance-station-client" do pkg "Install Synology Surveillance Station Client.pkg" uninstall launchctl: "com.synology.svsclient-SurveillanceStationClient", - delete: "/Applications/Synology Surveillance Station Client.app", quit: "com.synology.svsclient-SurveillanceStationClient", pkgutil: [ "com.synology.svsclient-Live-View", @@ -23,7 +22,8 @@ cask "synology-surveillance-station-client" do "com.synology.svsclient-Recording", "com.synology.svsclient-Timeline", "com.synology.svsclient-SurveillanceStationClient", - ] + ], + delete: "/Applications/Synology Surveillance Station Client.app" zap trash: [ "~/Library/Application Support/SynologySurveillanceStationClient", diff --git a/Casks/t/tableau-prep.rb b/Casks/t/tableau-prep.rb index 9304e5fc7f..f51fc6ca35 100644 --- a/Casks/t/tableau-prep.rb +++ b/Casks/t/tableau-prep.rb @@ -32,7 +32,11 @@ cask "tableau-prep" do "simba.sparkodbc", ] - zap trash: [ + zap delete: [ + "/Library/Application Support/Tableau Prep Builder", + "/Library/Preferences/FLEXnet Publisher", + ], + trash: [ "~/Documents/My Tableau Prep Repository", "~/Library/Application Support/Tableau Prep Builder #{version}", "~/Library/Caches/com.tableau.caching", @@ -41,9 +45,5 @@ cask "tableau-prep" do "~/Library/Preferences/com.tableausoftware.tabminerva.plist", "~/Library/Saved Application State/com.tableausoftware.tableauprep.savedState", "~/Library/Tableau", - ], - delete: [ - "/Library/Application Support/Tableau Prep Builder", - "/Library/Preferences/FLEXnet Publisher", ] end diff --git a/Casks/t/tableau-reader.rb b/Casks/t/tableau-reader.rb index 950ccd0752..c71af8d26e 100644 --- a/Casks/t/tableau-reader.rb +++ b/Casks/t/tableau-reader.rb @@ -25,12 +25,12 @@ cask "tableau-reader" do "com.tableausoftware.ReaderShortcuttab", ] - zap delete: "/Library/Preferences/com.tableau.Tableau-Reader-*.plist", - pkgutil: [ + zap pkgutil: [ "com.tableausoftware.extensions", "com.tableausoftware.networkExtensions", "com.tableausoftware.telemetry", ], + delete: "/Library/Preferences/com.tableau.Tableau-Reader-*.plist", trash: [ "~/Library/Caches/com.tableau.caching", "~/Library/Caches/com.tableausoftware.MapTiles", diff --git a/Casks/t/tableau.rb b/Casks/t/tableau.rb index 29100fb2d6..4135ed0e8d 100644 --- a/Casks/t/tableau.rb +++ b/Casks/t/tableau.rb @@ -34,7 +34,8 @@ cask "tableau" do "simba.sparkodbc", ] - zap trash: [ + zap delete: "/Library/Preferences/com.tableau.Tableau-#{version.major_minor}.plist", + trash: [ "/Library/Preferences/com.tableau.Tableau-#{version.major_minor}.plist", "~/Documents/My Tableau Repository", "~/Library/Caches/com.tableau.caching", @@ -43,6 +44,5 @@ cask "tableau" do "~/Library/Preferences/com.tableau.Tableau-#{version.major_minor}.plist", "~/Library/Saved Application State/com.tableausoftware.tableaudesktop.savedState", "~/Library/Tableau", - ], - delete: "/Library/Preferences/com.tableau.Tableau-#{version.major_minor}.plist" + ] end diff --git a/Casks/t/tailscale.rb b/Casks/t/tailscale.rb index 4fb14d5656..f06f0999ba 100644 --- a/Casks/t/tailscale.rb +++ b/Casks/t/tailscale.rb @@ -28,8 +28,8 @@ cask "tailscale" do EOS end - uninstall login_item: "Tailscale", - quit: "io.tailscale.ipn.macsys" + uninstall quit: "io.tailscale.ipn.macsys", + login_item: "Tailscale" zap trash: [ "~/Library/Tailscale", diff --git a/Casks/t/td-agent.rb b/Casks/t/td-agent.rb index d7a9326546..5fc605eb30 100644 --- a/Casks/t/td-agent.rb +++ b/Casks/t/td-agent.rb @@ -15,9 +15,9 @@ cask "td-agent" do pkg "td-agent-#{version}.pkg" - uninstall pkgutil: [ + uninstall launchctl: "td-agent", + pkgutil: [ "com.treasuredata.tdagent", "test.treasuredatainc.pkg.td-agent", - ], - launchctl: "td-agent" + ] end diff --git a/Casks/t/teamviewer.rb b/Casks/t/teamviewer.rb index 8c54eac007..0f02642271 100644 --- a/Casks/t/teamviewer.rb +++ b/Casks/t/teamviewer.rb @@ -74,17 +74,7 @@ cask "teamviewer" do opoo "Unable to forcibly close TeamViewer" end - uninstall delete: [ - "/Applications/TeamViewer.app", - "/Library/Preferences/com.teamviewer*", - ], - pkgutil: [ - "com.teamviewer.AuthorizationPlugin", - "com.teamviewer.remoteaudiodriver", - "com.teamviewer.teamviewer.*", - "TeamViewerUninstaller", - ], - launchctl: [ + uninstall launchctl: [ "com.teamviewer.desktop", "com.teamviewer.Helper", "com.teamviewer.service", @@ -97,6 +87,16 @@ cask "teamviewer" do quit: [ "com.teamviewer.TeamViewer", "com.teamviewer.TeamViewerUninstaller", + ], + pkgutil: [ + "com.teamviewer.AuthorizationPlugin", + "com.teamviewer.remoteaudiodriver", + "com.teamviewer.teamviewer.*", + "TeamViewerUninstaller", + ], + delete: [ + "/Applications/TeamViewer.app", + "/Library/Preferences/com.teamviewer*", ] zap trash: [ diff --git a/Casks/t/tenable-nessus-agent.rb b/Casks/t/tenable-nessus-agent.rb index 53e47988e6..7b2c3249e5 100644 --- a/Casks/t/tenable-nessus-agent.rb +++ b/Casks/t/tenable-nessus-agent.rb @@ -22,14 +22,14 @@ cask "tenable-nessus-agent" do pkg "Install Nessus Agent.pkg" - uninstall pkgutil: "com.tenablesecurity.NessusAgent.Preferences", + uninstall launchctl: "com.tenablesecurity.nessusagent", + pkgutil: "com.tenablesecurity.NessusAgent.Preferences", delete: [ "/Library/NessusAgent", "/Library/LaunchDaemons/com.tenablesecurity.nessusagent.plist", "/Library/PreferencePanes/Nessus Agent Preferences.prefPane", "/private/etc/tenable_tag", - ], - launchctl: "com.tenablesecurity.nessusagent" + ] # No zap stanza required diff --git a/Casks/t/textsniper.rb b/Casks/t/textsniper.rb index 9c96a17ff2..d79f525064 100644 --- a/Casks/t/textsniper.rb +++ b/Casks/t/textsniper.rb @@ -18,8 +18,8 @@ cask "textsniper" do app "TextSniper.app" - uninstall quit: "com.valerijs.boguckis.TextSniper", - launchctl: "com.valerijs.boguckis.TextSniper-LaunchAtLoginHelper", + uninstall launchctl: "com.valerijs.boguckis.TextSniper-LaunchAtLoginHelper", + quit: "com.valerijs.boguckis.TextSniper", delete: "/Applications/TextSniper.app" zap trash: [ diff --git a/Casks/t/timemachineeditor.rb b/Casks/t/timemachineeditor.rb index 09b927efc9..02d7cea2aa 100644 --- a/Casks/t/timemachineeditor.rb +++ b/Casks/t/timemachineeditor.rb @@ -19,12 +19,12 @@ cask "timemachineeditor" do uninstall launchctl: "com.tclementdev.timemachineeditor.scheduler", pkgutil: "com.tclementdev.pkg.timemachineeditor" - zap trash: [ - "~/Library/Logs/TimeMachineEditor", - "~/Library/Preferences/com.tclementdev.timemachineeditor.application.plist", - ], - delete: [ + zap delete: [ "/Library/Logs/TimeMachineEditor", "/Library/TimeMachineEditor", + ], + trash: [ + "~/Library/Logs/TimeMachineEditor", + "~/Library/Preferences/com.tclementdev.timemachineeditor.application.plist", ] end diff --git a/Casks/t/todesk.rb b/Casks/t/todesk.rb index e49456a0a0..6dd9f917bd 100644 --- a/Casks/t/todesk.rb +++ b/Casks/t/todesk.rb @@ -16,15 +16,15 @@ cask "todesk" do pkg "ToDesk_#{version}.pkg" - uninstall delete: "/Applications/ToDesk.app", - launchctl: [ + uninstall launchctl: [ "com.youqu.todesk.desktop", "com.youqu.todesk.service", "com.youqu.todesk.startup", "com.youqu.todesk.client.startup", ], + quit: "com.youqu.todesk.mac", pkgutil: "com.youqu.todesk.mac", - quit: "com.youqu.todesk.mac" + delete: "/Applications/ToDesk.app" zap trash: [ "~/Library/Application Scripts/com.youqu.todesk.mac.LaunchHelper", diff --git a/Casks/t/toolreleases.rb b/Casks/t/toolreleases.rb index a3574dc12f..84bf5e8524 100644 --- a/Casks/t/toolreleases.rb +++ b/Casks/t/toolreleases.rb @@ -25,11 +25,11 @@ cask "toolreleases" do app "ToolReleases.app" - uninstall login_item: "ToolReleases", - quit: [ + uninstall quit: [ "com.developermaris.ToolReleases", "com.apple.systemevents", - ] + ], + login_item: "ToolReleases" zap trash: [ "~/Library/Caches/com.developermaris.ToolReleases", diff --git a/Casks/t/trezor-bridge.rb b/Casks/t/trezor-bridge.rb index 1b14a0b8b6..36766852cc 100644 --- a/Casks/t/trezor-bridge.rb +++ b/Casks/t/trezor-bridge.rb @@ -15,8 +15,8 @@ cask "trezor-bridge" do pkg "trezor-bridge-#{version}.pkg" - uninstall pkgutil: "com.bitcointrezor.pkg.TREZORBridge*", - launchctl: "com.bitcointrezor.trezorBridge.trezord", + uninstall launchctl: "com.bitcointrezor.trezorBridge.trezord", + pkgutil: "com.bitcointrezor.pkg.TREZORBridge*", delete: "/Applications/Utilities/TREZOR Bridge" zap trash: "~/Library/Logs/trezord.log" diff --git a/Casks/t/trim-enabler.rb b/Casks/t/trim-enabler.rb index 4d0b9510d1..ab713c401b 100644 --- a/Casks/t/trim-enabler.rb +++ b/Casks/t/trim-enabler.rb @@ -21,8 +21,8 @@ cask "trim-enabler" do app "Trim Enabler.app" - uninstall delete: "/Library/PrivilegedHelperTools/org.cindori.TEHelper", - launchctl: "org.cindori.TEHelper" + uninstall launchctl: "org.cindori.TEHelper", + delete: "/Library/PrivilegedHelperTools/org.cindori.TEHelper" zap trash: [ "~/Library/Application Support/CrashReporter/Trim Enabler_#{version.major}.plist", diff --git a/Casks/t/tripmode.rb b/Casks/t/tripmode.rb index 8ee9c9a732..071ba94742 100644 --- a/Casks/t/tripmode.rb +++ b/Casks/t/tripmode.rb @@ -33,11 +33,11 @@ cask "tripmode" do app "TripMode.app" - uninstall signal: ["TERM", "ch.tripmode.TripMode"], - launchctl: [ + uninstall launchctl: [ "ch.tripmode.nke.TripMode", "ch.tripmode.TripMode.HelperTool", ], + signal: ["TERM", "ch.tripmode.TripMode"], delete: "/Library/PrivilegedHelperTools/ch.tripmode.TripMode.HelperTool" zap trash: [ diff --git a/Casks/t/tunnelbear.rb b/Casks/t/tunnelbear.rb index 1d2c15a214..d306685c8d 100644 --- a/Casks/t/tunnelbear.rb +++ b/Casks/t/tunnelbear.rb @@ -35,8 +35,8 @@ cask "tunnelbear" do app "TunnelBear.app" - uninstall quit: "com.tunnelbear.mac.TunnelBear", - launchctl: "com.tunnelbear.mac.tbeard", + uninstall launchctl: "com.tunnelbear.mac.tbeard", + quit: "com.tunnelbear.mac.TunnelBear", delete: "/Library/PrivilegedHelperTools/com.tunnelbear.mac.tbeard" zap trash: [ diff --git a/Casks/t/tunnelblick.rb b/Casks/t/tunnelblick.rb index 28eee04838..76ac577f0a 100644 --- a/Casks/t/tunnelblick.rb +++ b/Casks/t/tunnelblick.rb @@ -32,8 +32,8 @@ cask "tunnelblick" do "net.tunnelblick.tunnelblick.LaunchAtLogin", "net.tunnelblick.tunnelblick.tunnelblickd", ], - delete: "/Library/Application Support/Tunnelblick", - quit: "net.tunnelblick.tunnelblick" + quit: "net.tunnelblick.tunnelblick", + delete: "/Library/Application Support/Tunnelblick" zap trash: [ "~/Library/Application Support/Tunnelblick", diff --git a/Casks/t/tuple.rb b/Casks/t/tuple.rb index d0bfdc66e7..1727de3c90 100644 --- a/Casks/t/tuple.rb +++ b/Casks/t/tuple.rb @@ -23,8 +23,8 @@ cask "tuple" do app "Tuple.app" - uninstall quit: "app.tuple.app", - launchctl: "app.tuple.app-LaunchAtLoginHelper" + uninstall launchctl: "app.tuple.app-LaunchAtLoginHelper", + quit: "app.tuple.app" zap trash: [ "~/Library/Application Scripts/app.tuple.app-LaunchAtLoginHelper", diff --git a/Casks/t/turbovnc-viewer.rb b/Casks/t/turbovnc-viewer.rb index 9ad70b3b9b..d45d05f2e3 100644 --- a/Casks/t/turbovnc-viewer.rb +++ b/Casks/t/turbovnc-viewer.rb @@ -13,11 +13,11 @@ cask "turbovnc-viewer" do pkg "TurboVNC.pkg" - uninstall pkgutil: "com.virtualgl.turbovnc", - script: { + uninstall script: { executable: "/opt/TurboVNC/bin/uninstall", sudo: true, - } + }, + pkgutil: "com.virtualgl.turbovnc" # No zap stanza required end diff --git a/Casks/t/tuxera-ntfs.rb b/Casks/t/tuxera-ntfs.rb index d18da6ca8d..2c9aa0ea5b 100644 --- a/Casks/t/tuxera-ntfs.rb +++ b/Casks/t/tuxera-ntfs.rb @@ -25,12 +25,12 @@ cask "tuxera-ntfs" do "com.tuxera.pkg.Tuxera_NTFS_compat", ] - zap trash: [ - "~/Library/Saved Application State/com.tuxera.TuxeraDiskManager.savedState", - "~/Library/Caches/com.tuxera.filesystems.ntfs.agent", - ], - delete: [ + zap delete: [ "/Library/Application Support/Tuxera NTFS", "/Library/Preferences/com.tuxera.NTFS.plist", + ], + trash: [ + "~/Library/Saved Application State/com.tuxera.TuxeraDiskManager.savedState", + "~/Library/Caches/com.tuxera.filesystems.ntfs.agent", ] end diff --git a/Casks/t/twonkyserver.rb b/Casks/t/twonkyserver.rb index c2cbb27d99..8032107d6f 100644 --- a/Casks/t/twonkyserver.rb +++ b/Casks/t/twonkyserver.rb @@ -14,12 +14,12 @@ cask "twonkyserver" do pkg "TwonkyServerInstaller-#{version}.pkg" - uninstall pkgutil: "com.twonky.server.Twonky", - launchctl: [ + uninstall launchctl: [ "com.twonky.server.Twonky", "com.twonky.server.tsuninstall", ], signal: ["TERM", "com.twonky.server.Twonky"], + pkgutil: "com.twonky.server.Twonky", delete: "/Applications/Twonky.app" zap trash: "~/Twonky Library.twonky" diff --git a/Casks/u/ubersicht.rb b/Casks/u/ubersicht.rb index 4ca2e0aecb..b5185fedd2 100644 --- a/Casks/u/ubersicht.rb +++ b/Casks/u/ubersicht.rb @@ -17,8 +17,8 @@ cask "ubersicht" do app "Übersicht.app" - uninstall login_item: "Übersicht", - quit: "tracesOf.Uebersicht" + uninstall quit: "tracesOf.Uebersicht", + login_item: "Übersicht" zap trash: [ "~/Library/Application Support/Übersicht", diff --git a/Casks/u/ui.rb b/Casks/u/ui.rb index aeeaf4bd7c..f02fe6735e 100644 --- a/Casks/u/ui.rb +++ b/Casks/u/ui.rb @@ -23,16 +23,16 @@ cask "ui" do pkg "#{version.csv.third}-macOS-#{version.csv.first}-#{version.csv.second}.pkg" - uninstall pkgutil: [ - "com.ui.uid.desktop", - "com.ui.uid.mac", - ], - launchctl: [ + uninstall launchctl: [ "application.com.ui.uid.desktop.25686722.25686727", "com.ui.uid.desktop.privilegedtool", "com.ui.uid.desktop.startup", ], - quit: "com.ui.uid.desktop" + quit: "com.ui.uid.desktop", + pkgutil: [ + "com.ui.uid.desktop", + "com.ui.uid.mac", + ] zap trash: [ "~/Library/Application Support/com.ui.uid.desktop/", diff --git a/Casks/u/uninstallpkg.rb b/Casks/u/uninstallpkg.rb index a05d20b50e..29d56e8ae6 100644 --- a/Casks/u/uninstallpkg.rb +++ b/Casks/u/uninstallpkg.rb @@ -16,8 +16,8 @@ cask "uninstallpkg" do app "UninstallPKG.app" - uninstall delete: "/Library/PrivilegedHelperTools/com.corecode.UninstallPKGDeleteHelper", - launchctl: "com.corecode.UninstallPKGDeleteHelper" + uninstall launchctl: "com.corecode.UninstallPKGDeleteHelper", + delete: "/Library/PrivilegedHelperTools/com.corecode.UninstallPKGDeleteHelper" zap trash: [ "~/Library/Application Support/UninstallPKG", diff --git a/Casks/u/unity.rb b/Casks/u/unity.rb index d93f9c5077..ea59cbad52 100644 --- a/Casks/u/unity.rb +++ b/Casks/u/unity.rb @@ -27,7 +27,8 @@ cask "unity" do pkgutil: "com.unity3d.UnityEditor5.x", delete: "/Applications/Unity" - zap trash: [ + zap delete: "/Library/Application Support/Unity", + trash: [ "/Library/Application Support/Unity", "~/Library/Application Support/Unity", "~/Library/Application Support/UnityHub", @@ -36,6 +37,5 @@ cask "unity" do "~/Library/Preferences/com.unity3d.unityhub.plist", "~/Library/Saved Application State/com.unity3d.unityhub.savedState", "~/Library/Unity", - ], - delete: "/Library/Application Support/Unity" + ] end diff --git a/Casks/u/utterly.rb b/Casks/u/utterly.rb index 67a22f3367..bf254ac3dc 100644 --- a/Casks/u/utterly.rb +++ b/Casks/u/utterly.rb @@ -13,9 +13,9 @@ cask "utterly" do pkg "Utterly.pkg" - uninstall quit: "app.utterly.Utterly.App", + uninstall launchctl: "app.utterly.Utterly.XPCHelper", + quit: "app.utterly.Utterly.App", pkgutil: "app.utterly.Utterly", - launchctl: "app.utterly.Utterly.XPCHelper", delete: [ "/Applications/Utterly.app", "/Library/Application Support/Utterly/UtterlyXPCHelper.xpc", diff --git a/Casks/v/v2rayx.rb b/Casks/v/v2rayx.rb index 1cfbe89d2d..0ca5a81b00 100644 --- a/Casks/v/v2rayx.rb +++ b/Casks/v/v2rayx.rb @@ -14,14 +14,14 @@ cask "v2rayx" do set_ownership "/Library/Application Support/V2RayX" end - uninstall delete: "/Library/Application Support/V2RayX", - launchctl: "v2rayproject.v2rayx.v2ray-core", + uninstall launchctl: "v2rayproject.v2rayx.v2ray-core", + signal: ["TERM", "cenmrev.V2RayX"], script: { executable: "#{appdir}/V2RayX.app/Contents/Resources/v2rayx_sysconf", args: ["off"], sudo: true, }, - signal: ["TERM", "cenmrev.V2RayX"] + delete: "/Library/Application Support/V2RayX" zap trash: [ "~/Library/Application Support/V2RayX", diff --git a/Casks/v/vallum.rb b/Casks/v/vallum.rb index eeef5d7776..4cd16f7175 100644 --- a/Casks/v/vallum.rb +++ b/Casks/v/vallum.rb @@ -17,11 +17,11 @@ cask "vallum" do app "Vallum.app" - uninstall pkgutil: "it.murus.afw.Vallum", - launchctl: [ + uninstall launchctl: [ "it.murus.afw.core", "it.murus.afw.helper", - ] + ], + pkgutil: "it.murus.afw.Vallum" zap trash: "~/Library/Preferences/it.murus.Vallum.plist" end diff --git a/Casks/v/videostream.rb b/Casks/v/videostream.rb index b976a3c3c5..b41eb98c51 100644 --- a/Casks/v/videostream.rb +++ b/Casks/v/videostream.rb @@ -15,6 +15,6 @@ cask "videostream" do "com.videostream.launcher", "com.videostream.updater.#{version}", ], - pkgutil: "com.videostream", - signal: ["TERM", "com.videostream"] + signal: ["TERM", "com.videostream"], + pkgutil: "com.videostream" end diff --git a/Casks/v/virtual-desktop-streamer.rb b/Casks/v/virtual-desktop-streamer.rb index 28bc425c1f..d398b59e83 100644 --- a/Casks/v/virtual-desktop-streamer.rb +++ b/Casks/v/virtual-desktop-streamer.rb @@ -27,7 +27,12 @@ cask "virtual-desktop-streamer" do opoo "Unable to forcibly close Virtual Desktop Streamer" end - uninstall quit: "com.virtualDesktopInc.Mac.Streamer", + uninstall launchctl: [ + "com.VirtualDesktop.autoinstall", + "com.VirtualDesktop.launch", + "com.VirtualDesktop.uninstall", + ], + quit: "com.virtualDesktopInc.Mac.Streamer", pkgutil: [ "com.VirtualDesktop.AudioDriver", "com.VirtualDesktop.Libs", @@ -35,11 +40,6 @@ cask "virtual-desktop-streamer" do "com.VirtualDesktop.VirtualDesktop", "com.VirtualDesktop.VirtualDesktopUpdater", ], - launchctl: [ - "com.VirtualDesktop.autoinstall", - "com.VirtualDesktop.launch", - "com.VirtualDesktop.uninstall", - ], delete: "/usr/local/bin/virtualdesktop/" zap trash: [ diff --git a/Casks/v/virtualgl.rb b/Casks/v/virtualgl.rb index 5e8db8a789..576eff4767 100644 --- a/Casks/v/virtualgl.rb +++ b/Casks/v/virtualgl.rb @@ -10,9 +10,9 @@ cask "virtualgl" do pkg "VirtualGL.pkg" - uninstall pkgutil: "com.virtualgl.vglclient", - script: { + uninstall script: { executable: "/opt/VirtualGL/bin/uninstall", sudo: true, - } + }, + pkgutil: "com.virtualgl.vglclient" end diff --git a/Casks/v/viscosity.rb b/Casks/v/viscosity.rb index 09268c4e50..589ea6f85d 100644 --- a/Casks/v/viscosity.rb +++ b/Casks/v/viscosity.rb @@ -17,12 +17,12 @@ cask "viscosity" do app "Viscosity.app" - uninstall delete: [ + uninstall launchctl: "com.sparklabs.ViscosityHelper", + signal: ["TERM", "com.viscosityvpn.Viscosity"], + delete: [ "/Library/Application Support/Viscosity", "/Library/PrivilegedHelperTools/com.sparklabs.ViscosityHelper", - ], - launchctl: "com.sparklabs.ViscosityHelper", - signal: ["TERM", "com.viscosityvpn.Viscosity"] + ] zap trash: [ "~/Library/Application Support/Viscosity", diff --git a/Casks/v/vmware-horizon-client.rb b/Casks/v/vmware-horizon-client.rb index ae14ab08d3..ab5a07e624 100644 --- a/Casks/v/vmware-horizon-client.rb +++ b/Casks/v/vmware-horizon-client.rb @@ -35,19 +35,19 @@ cask "vmware-horizon-client" do pkg "VMware Horizon Client.pkg" - uninstall quit: "com.vmware.horizon", + uninstall launchctl: [ + "com.vmware.deem.MacUIEvents", + "com.vmware.deemd", + "com.vmware.horizon.CDSHelper", + "com.vmware.vmwetlm", + ], + quit: "com.vmware.horizon", pkgutil: [ "com.vmware.horizon", "com.vmware.VMware.Deem", "com.vmware.VMware.Deem.InstallerHelper", "com.vmware.VMware.EndpointTelemetryService", ], - launchctl: [ - "com.vmware.deem.MacUIEvents", - "com.vmware.deemd", - "com.vmware.horizon.CDSHelper", - "com.vmware.vmwetlm", - ], delete: [ "/Applications/VMware Horizon Client.app", "/Library/Application Support/VMware", diff --git a/Casks/v/vuze.rb b/Casks/v/vuze.rb index 2e897b0ad3..00fcb74dc8 100644 --- a/Casks/v/vuze.rb +++ b/Casks/v/vuze.rb @@ -17,11 +17,11 @@ cask "vuze" do sudo: true, } - uninstall delete: [ + uninstall quit: "com.azureus.vuze", + delete: [ "/Applications/Vuze.app", "/Applications/Uninstaller for Vuze.app", - ], - quit: "com.azureus.vuze" + ] zap trash: "~/Library/Application Support/Vuze" end diff --git a/Casks/v/vyprvpn.rb b/Casks/v/vyprvpn.rb index f6d76197e4..80b5fd21d7 100644 --- a/Casks/v/vyprvpn.rb +++ b/Casks/v/vyprvpn.rb @@ -18,25 +18,25 @@ cask "vyprvpn" do app "VyprVPN.app" - uninstall quit: "com.goldenfrog.VyprVPN*", - launchctl: [ + uninstall launchctl: [ "vyprvpnservice", "com.goldenfrog.resourcewatchdog", "com.goldenfrog.VyprVPNUserAgent", ], + quit: "com.goldenfrog.VyprVPN*", kext: "com.goldenfrog.VyprVPNMalwareFilter" - zap trash: [ + zap launchctl: "org.openvpn", + kext: [ + "net.sf.tuntaposx.tap", + "net.sf.tuntaposx.tun", + ], + trash: [ "/Library/LaunchDaemons/vyrpvpnservice.plist", "/Library/PrivilegedHelperTools/vyprvpnservice", "~/Library/Caches/com.goldenfrog.VyprVPN", "~/Library/LaunchAgents/com.goldenfrog.VyprVPNUserAgent.plist", "~/Library/Logs/GoldenFrog/VyprVPN.log", "~/Library/Preferences/com.goldenfrog.VyprVPN.plist", - ], - kext: [ - "net.sf.tuntaposx.tap", - "net.sf.tuntaposx.tun", - ], - launchctl: "org.openvpn" + ] end diff --git a/Casks/w/wacom-tablet.rb b/Casks/w/wacom-tablet.rb index 0c439b9fb6..5f7b0185f3 100644 --- a/Casks/w/wacom-tablet.rb +++ b/Casks/w/wacom-tablet.rb @@ -16,12 +16,7 @@ cask "wacom-tablet" do pkg "Install Wacom Tablet.pkg" - uninstall pkgutil: "com.wacom.TabletInstaller", - quit: [ - "com.wacom.wacomtablet", - "com.wacom.WacomTouchDriver", - ], - launchctl: [ + uninstall launchctl: [ "com.wacom.DataStoreMgr", "com.wacom.IOManager", "com.wacom.TabletDriver*", @@ -30,7 +25,12 @@ cask "wacom-tablet" do "com.wacom.WacomCenter*", "com.wacom.WacomExperienceProgram*", "com.wacom.wacomtablet", - ] + ], + quit: [ + "com.wacom.wacomtablet", + "com.wacom.WacomTouchDriver", + ], + pkgutil: "com.wacom.TabletInstaller" zap trash: [ "~/Library/Application Scripts/*.com.wacom.WacomTabletDriver", diff --git a/Casks/w/wch-ch34x-usb-serial-driver.rb b/Casks/w/wch-ch34x-usb-serial-driver.rb index 450419f7a7..fac859348e 100644 --- a/Casks/w/wch-ch34x-usb-serial-driver.rb +++ b/Casks/w/wch-ch34x-usb-serial-driver.rb @@ -15,11 +15,11 @@ cask "wch-ch34x-usb-serial-driver" do pkg "CH341SER_MAC/CH34xVCPDriver.pkg" uninstall quit: "cn.wch.CH34xVCPDriver", - pkgutil: "cn.wch.pkg.CH34xVCPDriver", kext: [ "cn.wch.CH34xVCPDriver", "cn.wch.CH34xVCPControlDriver", - ] + ], + pkgutil: "cn.wch.pkg.CH34xVCPDriver" caveats do reboot diff --git a/Casks/w/webcamoid.rb b/Casks/w/webcamoid.rb index fa893fc7f8..76fe46a684 100644 --- a/Casks/w/webcamoid.rb +++ b/Casks/w/webcamoid.rb @@ -12,8 +12,8 @@ cask "webcamoid" do app "Webcamoid.app" - uninstall quit: "com.webcamoidprj.webcamoid", - launchctl: "org.webcamoid.cmio.AkVCam.Assistant", + uninstall launchctl: "org.webcamoid.cmio.AkVCam.Assistant", + quit: "com.webcamoidprj.webcamoid", delete: "/Library/CoreMediaIO/Plug-Ins/DAL/AkVirtualCamera.plugin" zap trash: [ diff --git a/Casks/w/webex-meetings.rb b/Casks/w/webex-meetings.rb index fca0aa7e6c..60276b27ec 100644 --- a/Casks/w/webex-meetings.rb +++ b/Casks/w/webex-meetings.rb @@ -15,10 +15,12 @@ cask "webex-meetings" do pkg "Cisco_Webex_Meetings.pkg" - uninstall quit: [ + uninstall launchctl: "com.webex.pluginagent", + quit: [ "com.cisco.webex.webexmta", "com.cisco.webexmeetingsapp", ], + pkgutil: "mc.mac.webex.com", delete: [ "/Applications/Cisco Webex Meetings.app", "/Applications/Webex", # App seems to get installed here on macOS < 10.15 @@ -28,8 +30,6 @@ cask "webex-meetings" do "~/Library/Application Support/WebEx Folder/T33_64UMC*/WebexAppLauncher.app", "~/Library/Internet Plug-Ins/WebEx64.plugin", ], - launchctl: "com.webex.pluginagent", - pkgutil: "mc.mac.webex.com", rmdir: "~/Library/Application Support/WebEx Folder/T33_64UMC*" zap trash: [ diff --git a/Casks/w/whatroute.rb b/Casks/w/whatroute.rb index dc38fc78d2..fe98afcc48 100644 --- a/Casks/w/whatroute.rb +++ b/Casks/w/whatroute.rb @@ -16,12 +16,12 @@ cask "whatroute" do app "WhatRoute.app" - uninstall delete: "/Library/PrivilegedHelperTools/net.whatroute.whatroute#{version.major}helper", - launchctl: [ + uninstall launchctl: [ "net.whatroute.LaunchHelper", "net.whatroute.whatroute#{version.major}helper", ], - quit: "net.whatroute.whatroute#{version.major}" + quit: "net.whatroute.whatroute#{version.major}", + delete: "/Library/PrivilegedHelperTools/net.whatroute.whatroute#{version.major}helper" zap trash: [ "~/Library/Caches/net.whatroute.whatroute#{version.major}", diff --git a/Casks/w/whatsize.rb b/Casks/w/whatsize.rb index 2c910eba7e..e54972dd95 100644 --- a/Casks/w/whatsize.rb +++ b/Casks/w/whatsize.rb @@ -16,8 +16,8 @@ cask "whatsize" do pkg "WhatSize.pkg" - uninstall pkgutil: "com.id-design.v#{version.major}.whatsize.pkg", - launchctl: "com.id-design.v#{version.major}.whatsizehelper" + uninstall launchctl: "com.id-design.v#{version.major}.whatsizehelper", + pkgutil: "com.id-design.v#{version.major}.whatsize.pkg" zap trash: [ "~/Library/Application Support/WhatSize", diff --git a/Casks/w/whatsyoursign.rb b/Casks/w/whatsyoursign.rb index 2e364cf7e1..3557291600 100644 --- a/Casks/w/whatsyoursign.rb +++ b/Casks/w/whatsyoursign.rb @@ -10,19 +10,19 @@ cask "whatsyoursign" do installer manual: "WhatsYourSign Installer.app" - uninstall delete: [ - "/Applications/WhatsYourSign.app", - "~/Library/Application Scripts/com.objective-see.WhatsYourSignExt.FinderSync", - "~/Library/Containers/com.objective-see.WhatsYourSignExt.FinderSync", - ], - script: { + uninstall script: { executable: "/usr/bin/pluginkit", args: [ "-r", "/Applications/WhatsYourSign.app/Contents/PlugIns/WhatsYourSign.appex", ], must_succeed: false, - } + }, + delete: [ + "/Applications/WhatsYourSign.app", + "~/Library/Application Scripts/com.objective-see.WhatsYourSignExt.FinderSync", + "~/Library/Containers/com.objective-see.WhatsYourSignExt.FinderSync", + ] zap trash: "~/Library/Saved Application State/com.objective-see.WhatsYourSign.savedState" end diff --git a/Casks/w/wifi-explorer-pro.rb b/Casks/w/wifi-explorer-pro.rb index 978be545ec..0e873cf71a 100644 --- a/Casks/w/wifi-explorer-pro.rb +++ b/Casks/w/wifi-explorer-pro.rb @@ -16,11 +16,11 @@ cask "wifi-explorer-pro" do pkg "WiFiExplorerPro_#{version}.pkg" - uninstall pkgutil: [ + uninstall launchctl: "com.intuitibits.wifiexplorerpro#{version.major}.wifiexplorerpro-bpf", + pkgutil: [ "com.intuitibits.wifiexplorerpro#{version.major}.pkg", "com.intuitibits.wifiexplorerpro-helper.pkg", - ], - launchctl: "com.intuitibits.wifiexplorerpro#{version.major}.wifiexplorerpro-bpf" + ] zap trash: [ "~/Library/Application Support/WiFi Explorer Pro #{version.major}", diff --git a/Casks/w/wire.rb b/Casks/w/wire.rb index 5a15ce5f49..b44f77eebd 100644 --- a/Casks/w/wire.rb +++ b/Casks/w/wire.rb @@ -15,11 +15,11 @@ cask "wire" do pkg "Wire.pkg" - uninstall pkgutil: "com.wearezeta.zclient.mac", - signal: [ + uninstall signal: [ ["TERM", "com.wearezeta.zclient.mac.helper"], ["TERM", "com.wearezeta.zclient.mac"], - ] + ], + pkgutil: "com.wearezeta.zclient.mac" zap trash: "~/Library/Containers/com.wearezeta.zclient.mac" end diff --git a/Casks/w/wkhtmltopdf.rb b/Casks/w/wkhtmltopdf.rb index c5f065e05c..7eb678e3de 100644 --- a/Casks/w/wkhtmltopdf.rb +++ b/Casks/w/wkhtmltopdf.rb @@ -12,7 +12,11 @@ cask "wkhtmltopdf" do pkg "wkhtmltox-#{version}.macos-cocoa.pkg" - uninstall pkgutil: "org.wkhtmltopdf.wkhtmltox", + uninstall script: { + executable: "/usr/local/bin/uninstall-wkhtmltox", + sudo: true, + }, + pkgutil: "org.wkhtmltopdf.wkhtmltox", delete: [ "/usr/local/bin/wkhtmltoimage", "/usr/local/bin/wkhtmltopdf", @@ -21,11 +25,7 @@ cask "wkhtmltopdf" do "/usr/local/lib/libwkhtmltox.#{version.major}.dylib", "/usr/local/lib/libwkhtmltox.#{version.sub(/-.*$/, "")}.dylib", "/usr/local/lib/libwkhtmltox.dylib", - ], - script: { - executable: "/usr/local/bin/uninstall-wkhtmltox", - sudo: true, - } + ] # No zap stanza required diff --git a/Casks/w/workspace-one-intelligent-hub.rb b/Casks/w/workspace-one-intelligent-hub.rb index 586460d543..1cac23337e 100644 --- a/Casks/w/workspace-one-intelligent-hub.rb +++ b/Casks/w/workspace-one-intelligent-hub.rb @@ -18,13 +18,7 @@ cask "workspace-one-intelligent-hub" do pkg "VMwareWorkspaceONEIntelligentHub.pkg" - uninstall pkgutil: [ - "com.air-watch.pkg.OSXAgent", - "com.airwatch.munki.admin", - "com.airwatch.munki.core", - "com.airwatch.munki.python", - ], - launchctl: [ + uninstall launchctl: [ "com.airwatch.awcmd", "com.airwatch.mac.agent", "com.vmware.hub.flagd", @@ -33,6 +27,12 @@ cask "workspace-one-intelligent-hub" do "com.vmware.hubupdateagent", "com.vmware.uem.hubd", "com.vmware.uem.hublogd", + ], + pkgutil: [ + "com.air-watch.pkg.OSXAgent", + "com.airwatch.munki.admin", + "com.airwatch.munki.core", + "com.airwatch.munki.python", ] zap trash: [ diff --git a/Casks/x/xsplit-vcam.rb b/Casks/x/xsplit-vcam.rb index ccd7920ccd..cbed0672fa 100644 --- a/Casks/x/xsplit-vcam.rb +++ b/Casks/x/xsplit-vcam.rb @@ -29,13 +29,13 @@ cask "xsplit-vcam" do pkg "XSplit_VCam_#{version}_#{arch}.pkg" - uninstall quit: "com.xsplit.vcam", + uninstall launchctl: "com.xsplit.vcam.assistant", + quit: "com.xsplit.vcam", + pkgutil: "com.xsplit.vcam.installer.pkg", delete: [ "/Library/CoreMediaIO/Plug-Ins/DAL/XSplit VCam.plugin", "/Applications/XSplit VCam", - ], - launchctl: "com.xsplit.vcam.assistant", - pkgutil: "com.xsplit.vcam.installer.pkg" + ] zap trash: [ "/Library/Application Support/com.xsplit.vcam.dal", diff --git a/Casks/y/yo.rb b/Casks/y/yo.rb index 9676149df2..3272c76e19 100644 --- a/Casks/y/yo.rb +++ b/Casks/y/yo.rb @@ -11,10 +11,10 @@ cask "yo" do pkg "yo-#{version}.pkg" - uninstall delete: "/usr/local/bin/yo_scheduler", - launchctl: [ + uninstall launchctl: [ "com.sheagcraig.yo.login_once", "com.sheagcraig.yo.on_demand", ], - pkgutil: "com.sheagcraig.yo" + pkgutil: "com.sheagcraig.yo", + delete: "/usr/local/bin/yo_scheduler" end diff --git a/Casks/z/zenmap.rb b/Casks/z/zenmap.rb index c886634067..98a07884c2 100644 --- a/Casks/z/zenmap.rb +++ b/Casks/z/zenmap.rb @@ -16,14 +16,14 @@ cask "zenmap" do pkg "nmap-#{version}.mpkg" - uninstall delete: "/Applications/Zenmap.app", - pkgutil: [ + uninstall pkgutil: [ "org.insecure.nmap", "org.insecure.nmap.ncat", "org.insecure.nmap.ndiff", "org.insecure.nmap.nping", "org.insecure.nmap.zenmap", - ] + ], + delete: "/Applications/Zenmap.app" zap trash: [ "~/Library/Saved Application State/org.insecure.Zenmap.savedState", diff --git a/Casks/z/zerotier-one.rb b/Casks/z/zerotier-one.rb index 9aa4de285f..7ddc8c493c 100644 --- a/Casks/z/zerotier-one.rb +++ b/Casks/z/zerotier-one.rb @@ -16,9 +16,9 @@ cask "zerotier-one" do pkg "ZeroTier One.pkg" - uninstall quit: "com.zerotier.ZeroTier-One", - pkgutil: "com.zerotier.pkg.ZeroTierOne", - launchctl: "com.zerotier.one" + uninstall launchctl: "com.zerotier.one", + quit: "com.zerotier.ZeroTier-One", + pkgutil: "com.zerotier.pkg.ZeroTierOne" zap trash: "~/Library/Preferences/com.zerotier.ZeroTier-One.plist" end diff --git a/Casks/z/zoom-for-it-admins.rb b/Casks/z/zoom-for-it-admins.rb index ffce9290dd..7061854f31 100644 --- a/Casks/z/zoom-for-it-admins.rb +++ b/Casks/z/zoom-for-it-admins.rb @@ -16,9 +16,9 @@ cask "zoom-for-it-admins" do pkg "ZoomInstallerIT.pkg" - uninstall signal: ["KILL", "us.zoom.xos"], + uninstall launchctl: "us.zoom.ZoomDaemon", + signal: ["KILL", "us.zoom.xos"], pkgutil: "us.zoom.pkg.videomeeting", - launchctl: "us.zoom.ZoomDaemon", delete: [ "/Applications/zoom.us.app", "/Library/Audio/Plug-Ins/HAL/ZoomAudioDevice.driver", diff --git a/Casks/z/zoom.rb b/Casks/z/zoom.rb index 07e629189f..2f296d1e45 100644 --- a/Casks/z/zoom.rb +++ b/Casks/z/zoom.rb @@ -35,9 +35,9 @@ cask "zoom" do opoo "Unable to forcibly close zoom.us.app" end - uninstall signal: ["KILL", "us.zoom.xos"], + uninstall launchctl: "us.zoom.ZoomDaemon", + signal: ["KILL", "us.zoom.xos"], pkgutil: "us.zoom.pkg.videomeeting", - launchctl: "us.zoom.ZoomDaemon", delete: [ "/Applications/zoom.us.app", "/Library/Internet Plug-Ins/ZoomUsPlugIn.plugin",