diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-05-11 11:00:27 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-05-11 19:42:05 +0000 |
| commit | 75a4568a002edc7134c9a406ad1cce4b39fff678 (patch) | |
| tree | c543498910a37d74ff4057c3205d75da9e0e4900 /packaging | |
| parent | becc442da9d16e09d7a961cf8b47262e9071e98d (diff) | |
NSIS: Fixup some uninstall variables.
Add back the PROGRAM_NAME_GTK definition, since its links might be left
over from a previous install. Remove the PROGRAM_NAME_QT references,
since it's been the same as PROGRAM_NAME for quite a while.
Change-Id: I79724a6a1c9861ffae9aed6a59d48205a40941cd
Reviewed-on: https://code.wireshark.org/review/27459
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/uninstall.nsi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 193162d218..d8e41fc890 100644 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -233,17 +233,16 @@ Delete "$INSTDIR\user-guide.chm" Delete "$INSTDIR\example_snmp_users_file" Delete "$INSTDIR\radius\*.*" Delete "$INSTDIR\dtds\*.*" + +!define PROGRAM_NAME_GTK "${PROGRAM_NAME} Legacy" Delete "$SMPROGRAMS\${PROGRAM_NAME}\*.*" Delete "$SMPROGRAMS\${PROGRAM_NAME}.lnk" Delete "$SMPROGRAMS\${PROGRAM_NAME_GTK}.lnk" -Delete "$SMPROGRAMS\${PROGRAM_NAME_QT}.lnk" Delete "$SMPROGRAMS\Qtshark.lnk" Delete "$DESKTOP\${PROGRAM_NAME}.lnk" Delete "$DESKTOP\${PROGRAM_NAME_GTK}.lnk" -Delete "$DESKTOP\${PROGRAM_NAME_QT}.lnk" Delete "$QUICKLAUNCH\${PROGRAM_NAME}.lnk" Delete "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" -Delete "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" RMDir "$INSTDIR\accessible" RMDir "$INSTDIR\audio" |