diff --git a/Casks/blackhole-16ch.rb b/Casks/blackhole-16ch.rb index 913a8067894..0cc884e3af3 100644 --- a/Casks/blackhole-16ch.rb +++ b/Casks/blackhole-16ch.rb @@ -21,9 +21,6 @@ cask "blackhole-16ch" do must_succeed: true end - uninstall quit: [ - "com.apple.audio.AudioMIDISetup", - "com.apple.systempreferences", - ], + uninstall quit: "com.apple.audio.AudioMIDISetup", pkgutil: "audio.existential.BlackHole" end diff --git a/Casks/blackhole-2ch.rb b/Casks/blackhole-2ch.rb index 4d90d9a222e..6b3173fd3f6 100644 --- a/Casks/blackhole-2ch.rb +++ b/Casks/blackhole-2ch.rb @@ -21,9 +21,6 @@ cask "blackhole-2ch" do must_succeed: true end - uninstall quit: [ - "com.apple.audio.AudioMIDISetup", - "com.apple.systempreferences", - ], + uninstall quit: "com.apple.audio.AudioMIDISetup", pkgutil: "audio.existential.BlackHole" end diff --git a/Casks/emclient.rb b/Casks/emclient.rb index 5b9b3320a01..2fe6386efc4 100644 --- a/Casks/emclient.rb +++ b/Casks/emclient.rb @@ -18,8 +18,7 @@ cask "emclient" do pkg "setup.pkg" - uninstall quit: "application.com.apple.Safari.12886706636", - pkgutil: "com.emclient.mail.client.pkg" + uninstall pkgutil: "com.emclient.mail.client.pkg" zap trash: [ "~/Library/Caches/com.emclient.mail.client", diff --git a/Casks/odrive.rb b/Casks/odrive.rb index 7b75e433b84..5da8f33c7c1 100644 --- a/Casks/odrive.rb +++ b/Casks/odrive.rb @@ -1,6 +1,6 @@ cask "odrive" do - version "6918" - sha256 "9107f7634ac70cf017c889738b5bd8e3ac937bd991d5999119832d57407f0c22" + version "6931" + sha256 "2014d431480e849eaf1f941e893d3214c30bd86a913b8c1e84dedc572637abaa" url "https://d3huse1s6vwzq6.cloudfront.net/odrivesync.#{version}.pkg", verified: "d3huse1s6vwzq6.cloudfront.net/" @@ -18,8 +18,6 @@ cask "odrive" do uninstall quit: [ "com.oxygencloud.odrive", - "application.com.apple.installer.1152921500312163482", - "application.com.apple.systemevents.1152921500312199658", ], pkgutil: "com.oxygen.odrive.*" end diff --git a/Casks/snip.rb b/Casks/snip.rb index 1d40c635b36..e6685d97ece 100644 --- a/Casks/snip.rb +++ b/Casks/snip.rb @@ -18,8 +18,6 @@ cask "snip" do uninstall quit: [ "com.tencent.snip", - "com.apple.systemevents", - "com.apple.systempreferences", ], pkgutil: "com.tencent.snip.Snip.pkg" end diff --git a/cmd/lib/check.rb b/cmd/lib/check.rb index c1d368ba25e..27c0bebb220 100644 --- a/cmd/lib/check.rb +++ b/cmd/lib/check.rb @@ -48,6 +48,9 @@ module Check system_command!("/bin/launchctl", args: ["list"], print_stderr: false, sudo: sudo) .stdout .lines.drop(1) + .reject do |id| + id.match?(/\A(?:application\.)?com\.apple\.(installer|Safari|systemevents|systempreferences)(?:\.|$)/) + end end [false, true]