From 55ae7b059228a21a41d9dfd3ba8a93d1c34d5820 Mon Sep 17 00:00:00 2001 From: commitay Date: Mon, 9 Apr 2018 14:06:21 +1000 Subject: [PATCH 1/2] Update teamviewer, teamviewer-host: uninstall --- Casks/teamviewer-host.rb | 13 +++++++++++-- Casks/teamviewer.rb | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Casks/teamviewer-host.rb b/Casks/teamviewer-host.rb index 79fe58b8ad03..12da9cd10ffc 100644 --- a/Casks/teamviewer-host.rb +++ b/Casks/teamviewer-host.rb @@ -11,12 +11,21 @@ pkg 'Install TeamViewerHost.pkg' - uninstall pkgutil: 'com.teamviewer.*', + # This pkg and file should not be added to uninstall or zap + # https://github.com/caskroom/homebrew-cask/pull/45718 + # `pkg` com.teamviewer.teamviewer13AuthPlugin + # /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle + uninstall pkgutil: [ + "com.teamviewer.teamviewer#{version}Restarter", + "com.teamviewer.teamviewer#{version}Agent", + "com.teamviewer.teamviewer#{version}Font", + "com.teamviewer.teamviewer#{version}", + "com.teamviewer.teamviewer#{version}PriviledgedHelper", + ], delete: [ '/Applications/TeamViewerHost.app', "/Library/Fonts/TeamViewer#{version}Host.otf", '/Library/PrivilegedHelperTools/com.teamviewer.Helper', - '/Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle', ], launchctl: [ 'com.teamviewer.Helper', diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb index b8112067a566..a5ec6165d9b0 100644 --- a/Casks/teamviewer.rb +++ b/Casks/teamviewer.rb @@ -11,12 +11,21 @@ pkg 'Install TeamViewer.pkg' - uninstall pkgutil: 'com.teamviewer.*', + # This pkg and file should not be added to uninstall or zap + # https://github.com/caskroom/homebrew-cask/pull/45718 + # `pkg` com.teamviewer.teamviewer13AuthPlugin + # /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle + uninstall pkgutil: [ + "com.teamviewer.teamviewer#{version}Restarter", + "com.teamviewer.teamviewer#{version}Agent", + "com.teamviewer.teamviewer#{version}Font", + "com.teamviewer.teamviewer#{version}", + "com.teamviewer.teamviewer#{version}PriviledgedHelper", + ], delete: [ '/Applications/TeamViewer.app', "/Library/Fonts/TeamViewer#{version}.otf", '/Library/PrivilegedHelperTools/com.teamviewer.Helper', - '/Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle', ], launchctl: [ 'com.teamviewer.Helper', From f353fbb2acd1ef60c736ea73593888709eaa83cc Mon Sep 17 00:00:00 2001 From: commitay Date: Mon, 9 Apr 2018 14:34:02 +1000 Subject: [PATCH 2/2] remove uninstall --- Casks/teamviewer-host.rb | 25 +------------------------ Casks/teamviewer.rb | 25 +------------------------ 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/Casks/teamviewer-host.rb b/Casks/teamviewer-host.rb index 12da9cd10ffc..656846026cc6 100644 --- a/Casks/teamviewer-host.rb +++ b/Casks/teamviewer-host.rb @@ -11,30 +11,7 @@ pkg 'Install TeamViewerHost.pkg' - # This pkg and file should not be added to uninstall or zap - # https://github.com/caskroom/homebrew-cask/pull/45718 - # `pkg` com.teamviewer.teamviewer13AuthPlugin - # /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle - uninstall pkgutil: [ - "com.teamviewer.teamviewer#{version}Restarter", - "com.teamviewer.teamviewer#{version}Agent", - "com.teamviewer.teamviewer#{version}Font", - "com.teamviewer.teamviewer#{version}", - "com.teamviewer.teamviewer#{version}PriviledgedHelper", - ], - delete: [ - '/Applications/TeamViewerHost.app', - "/Library/Fonts/TeamViewer#{version}Host.otf", - '/Library/PrivilegedHelperTools/com.teamviewer.Helper', - ], - launchctl: [ - 'com.teamviewer.Helper', - 'com.teamviewer.desktop', - 'com.teamviewer.service', - 'com.teamviewer.teamviewer', - 'com.teamviewer.teamviewer_service', - ], - quit: 'com.teamviewer.TeamViewerHost' + uninstall delete: "#{staged_path}/#{token}" # This Cask should be uninstalled manually. zap trash: [ '/Library/Preferences/com.teamviewer.teamviewer.preferences.plist', diff --git a/Casks/teamviewer.rb b/Casks/teamviewer.rb index a5ec6165d9b0..3fab714cc5da 100644 --- a/Casks/teamviewer.rb +++ b/Casks/teamviewer.rb @@ -11,30 +11,7 @@ pkg 'Install TeamViewer.pkg' - # This pkg and file should not be added to uninstall or zap - # https://github.com/caskroom/homebrew-cask/pull/45718 - # `pkg` com.teamviewer.teamviewer13AuthPlugin - # /Library/Security/SecurityAgentPlugins/TeamViewerAuthPlugin.bundle - uninstall pkgutil: [ - "com.teamviewer.teamviewer#{version}Restarter", - "com.teamviewer.teamviewer#{version}Agent", - "com.teamviewer.teamviewer#{version}Font", - "com.teamviewer.teamviewer#{version}", - "com.teamviewer.teamviewer#{version}PriviledgedHelper", - ], - delete: [ - '/Applications/TeamViewer.app', - "/Library/Fonts/TeamViewer#{version}.otf", - '/Library/PrivilegedHelperTools/com.teamviewer.Helper', - ], - launchctl: [ - 'com.teamviewer.Helper', - 'com.teamviewer.desktop', - 'com.teamviewer.service', - 'com.teamviewer.teamviewer', - 'com.teamviewer.teamviewer_service', - ], - quit: 'com.teamviewer.TeamViewer' + uninstall delete: "#{staged_path}/#{token}" # This Cask should be uninstalled manually. zap trash: [ '/Library/Preferences/com.teamviewer.teamviewer.preferences.plist',