From abe3be96a2a779d8b47a816238ff9075f86de77e Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Wed, 1 Apr 2020 15:29:52 +0100
Subject: [PATCH] msteams: don't worry if reg key isn't there to be deleted in
the remove cmd
---
packages/msteams.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/msteams.xml b/packages/msteams.xml
index e632e7be..fd998347 100755
--- a/packages/msteams.xml
+++ b/packages/msteams.xml
@@ -19,7 +19,9 @@
<remove cmd='msiexec /qn /x {%msi_guid%}' />
<!-- uninstaller doesn't delete the uninstall key for some reason and yes, even though we install the x64 version the uninstall is x86. See URL at top for this issue being reported -->
- <remove cmd='reg delete HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{%msi_guid%} /f' />
+ <remove cmd='reg delete HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{%msi_guid%} /f'>
+ <exit code="1"/> <!-- don't make wpkg error if key does not exist though -->
+ </remove>
<remove cmd='cscript %WPKGSOFTWARE%\wpkg\tools\delete-shortcut.js /folder:"Microsoft Teams" ' />
</package>
--
GitLab