aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis/wireshark.nsi
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-06-06 19:04:46 +0000
committerGerald Combs <gerald@wireshark.org>2013-06-06 19:04:46 +0000
commit693bcb654ceb59ac162b6fe13d1af28c5580a066 (patch)
treeb9bf4a94395d850f8befda445a6e4ddaf3089736 /packaging/nsis/wireshark.nsi
parent57eb433a0bc1e69f210475776be62b32cb5c9cc8 (diff)
Have the NSIS installer run the existing uninstaller silently. This
should save a few mouse clicks during the installation process. svn path=/trunk/; revision=49813
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
-rw-r--r--packaging/nsis/wireshark.nsi6
1 files changed, 0 insertions, 6 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 9d6c559134..8bfbfd64fa 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -248,14 +248,8 @@ prep_uninstaller:
StrCpy $1 "$TEMP\${PROGRAM_NAME}_uninstaller.exe"
StrCpy $2 1
System::Call 'kernel32::CopyFile(t r0, t r1, b r2) 1'
- IfSilent silent_uninstall
- ExecWait "$TMP_UNINSTALLER _?=$OLD_INSTDIR"
- Goto cleanup
-
-silent_uninstall:
ExecWait "$TMP_UNINSTALLER /S _?=$OLD_INSTDIR"
-cleanup:
Delete "$TMP_UNINSTALLER"
done: