From 28a4466c7bce2be4413fb01d8ea8d7bec5593735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 20 Jan 2023 13:43:28 +0000 Subject: [PATCH] NSIS: Leave old uninstall entries intact --- packaging/nsis/uninstall-logray.nsi | 3 +++ packaging/nsis/uninstall-wireshark.nsi | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packaging/nsis/uninstall-logray.nsi b/packaging/nsis/uninstall-logray.nsi index 6f392bd211..5a8d440b95 100644 --- a/packaging/nsis/uninstall-logray.nsi +++ b/packaging/nsis/uninstall-logray.nsi @@ -102,6 +102,7 @@ Push "${EXECUTABLE_MARKER}" Push "${PROGRAM_NAME}" Push "capinfos" Push "captype" +Push "dftest" Push "dumpcap" Push "editcap" Push "mergecap" @@ -148,6 +149,8 @@ Delete "$INSTDIR\COPYING*" Delete "$INSTDIR\audio\*.*" Delete "$INSTDIR\bearer\*.*" Delete "$INSTDIR\diameter\*.*" +Delete "$INSTDIR\gpl-2.0-standalone.html" +Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*" diff --git a/packaging/nsis/uninstall-wireshark.nsi b/packaging/nsis/uninstall-wireshark.nsi index 1f0a5252ae..272f591e23 100644 --- a/packaging/nsis/uninstall-wireshark.nsi +++ b/packaging/nsis/uninstall-wireshark.nsi @@ -129,6 +129,7 @@ Push "${EXECUTABLE_MARKER}" Push "${PROGRAM_NAME}" Push "capinfos" Push "captype" +Push "dftest" Push "dumpcap" Push "editcap" Push "mergecap" @@ -185,6 +186,8 @@ Delete "$INSTDIR\extcap\randpktdump.*" Delete "$INSTDIR\extcap\sshdump.*" Delete "$INSTDIR\extcap\udpdump.*" Delete "$INSTDIR\extcap\wifidump.*" +Delete "$INSTDIR\gpl-2.0-standalone.html" +Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\help\*.*" Delete "$INSTDIR\iconengines\*.*" Delete "$INSTDIR\imageformats\*.*"