aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorChuck Craft <bubbasnmp@gmail.com>2022-10-26 11:07:24 -0500
committerA Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2022-10-28 14:59:49 +0000
commita4f1e5c6fe5326f9e60242656790133fa54f22a7 (patch)
tree06b68c29df1367cc8984b9901b1f334dd20002f2 /packaging
parent267954cda2198ff81525b803223d7f0eed918bf0 (diff)
NSIS: uninstall etwdump; extcap binaries not in program directory
Could not find evidence that extcap binaries were ever in program folder so should not affect uninstall of old versions.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/uninstall-wireshark.nsi9
1 files changed, 2 insertions, 7 deletions
diff --git a/packaging/nsis/uninstall-wireshark.nsi b/packaging/nsis/uninstall-wireshark.nsi
index 7e614f7c60..272f591e23 100644
--- a/packaging/nsis/uninstall-wireshark.nsi
+++ b/packaging/nsis/uninstall-wireshark.nsi
@@ -127,23 +127,17 @@ SetShellVarContext all
Push "${EXECUTABLE_MARKER}"
Push "${PROGRAM_NAME}"
-Push "androiddump"
Push "capinfos"
Push "captype"
-Push "ciscodump"
Push "dftest"
Push "dumpcap"
Push "editcap"
Push "mergecap"
Push "randpkt"
-Push "randpktdump"
Push "rawshark"
Push "reordercap"
-Push "sshdump"
Push "text2pcap"
Push "tshark"
-Push "udpdump"
-Push "wifidump"
!ifdef MMDBRESOLVE_EXE
Push "mmdbresolve"
@@ -186,9 +180,10 @@ Delete "$INSTDIR\audio\*.*"
Delete "$INSTDIR\bearer\*.*"
Delete "$INSTDIR\diameter\*.*"
Delete "$INSTDIR\extcap\androiddump.*"
+Delete "$INSTDIR\extcap\ciscodump.*"
+Delete "$INSTDIR\extcap\etwdump.*"
Delete "$INSTDIR\extcap\randpktdump.*"
Delete "$INSTDIR\extcap\sshdump.*"
-Delete "$INSTDIR\extcap\ciscodump.*"
Delete "$INSTDIR\extcap\udpdump.*"
Delete "$INSTDIR\extcap\wifidump.*"
Delete "$INSTDIR\gpl-2.0-standalone.html"