diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-11 22:20:33 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-12-12 07:30:51 +0000 |
| commit | 6c38ec1aab82d5347451ba3a0058cd81f4218daa (patch) | |
| tree | 292d08f7b02cf417e5b4f4b53b8fd29eb150d0b5 /packaging/nsis | |
| parent | 80df76a28f077824d874102a171758757188fdf9 (diff) | |
Update USBPcap installer packaged
NSIS script modified to:
- check for KB 3033929 presence on Windows 7 / 2008R2 (as we sign drivers with a SHA2 certificate)
- do not delete the installation folder if not empty
Bug: 11766
Change-Id: I5c7b6378b0775bb75c1b9e58e503997176c12213
Reviewed-on: https://code.wireshark.org/review/12546
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 57ff291a8e..3dfb7cdb96 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -841,8 +841,8 @@ IfSilent SecRequired_skip_USBPcap ReadINIStr $0 "$PLUGINSDIR\USBPcapPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_USBPcap SetOutPath $INSTDIR -File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe" -ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}.exe"' $0 +File "${WIRESHARK_LIB_DIR}\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe" +ExecWait '"$INSTDIR\USBPcapSetup-${USBPCAP_DISPLAY_VERSION}-1.exe"' $0 DetailPrint "USBPcap installer returned $0" ${If} $0 == "0" ${If} ${RunningX64} |