From 6c38ec1aab82d5347451ba3a0058cd81f4218daa Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 11 Dec 2015 22:20:33 +0100 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- packaging/nsis/wireshark.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') 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} -- cgit v1.2.3