diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
| commit | ea4f5189975b3a8423f75e85bb7be79bae851f96 (patch) | |
| tree | 9bcd4cbdb29cd9083862cb081c2a0ec6df3f2efc /packaging/nsis/uninstall.nsi | |
| parent | b34abdc9435e8127c42ca842cd2d5429c45ccc46 (diff) | |
| download | wireshark-ea4f5189975b3a8423f75e85bb7be79bae851f96.tar.gz | |
Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)
Now qtshark is (normally) available in automated build !
svn path=/trunk/; revision=45485
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 6c59bc9f73..2f603d85b3 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -104,6 +104,12 @@ IfErrors 0 NoTSharkErrorMsg Abort "Please note: tshark.exe could not be removed, it's probably in use! Abort uninstall process!" NoTSharkErrorMsg: +Delete "$INSTDIR\Qtshark.exe" +IfErrors 0 NoQtSharkErrorMsg + MessageBox MB_OK "Please note: qtshark.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if qtshark.exe removed + Abort "Please note: qtshark.exe could not be removed, it's probably in use! Abort uninstall process!" +NoQtSharkErrorMsg: + Delete "$INSTDIR\wireshark.exe" IfErrors 0 NoWiresharkErrorMsg MessageBox MB_OK "Please note: wireshark.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if wireshark.exe removed @@ -167,6 +173,7 @@ Delete "$INSTDIR\radius\*.*" Delete "$INSTDIR\dtds\*.*" Delete "$SMPROGRAMS\Wireshark\*.*" Delete "$SMPROGRAMS\Wireshark.lnk" +Delete "$SMPROGRAMS\Qtshark.lnk" Delete "$DESKTOP\Wireshark.lnk" Delete "$QUICKLAUNCH\Wireshark.lnk" |