osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Gerald Combs 2013-06-06 19:04:46 +00:00
parent 57eb433a0b
commit 693bcb654c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docbook/release-notes.asciidoc
View File

@ -23,6 +23,8 @@ The following features are new (or have been significantly updated)
since version 1.10:
* Expert info is now filterable (if the dissector has been updated to support the new API).
* The Windows installer now uninstalls the previous version of Wireshark silently.
You can still run the uninstaller manually beforehand if you wish to run it interactively.
=== New Protocol Support

6
packaging/nsis/wireshark.nsi
View File

@ -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: