osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Now the Microsoft Visual C++ 2010 redistributable for x86 (32-bit) brings up a confusing dialog asking the user to repair or remove it if it's already installed. Change it to (re-)install quietly (/q command-line option) like we do with the 64-bit version. 

svn path=/trunk/; revision=35094
This commit is contained in:
Stephen Fisher 2010-12-01 20:48:44 +00:00
parent 462245684a
commit 68241fa66f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/nsis/wireshark.nsi
View File

@ -422,12 +422,12 @@ File "..\..\ipmap.html"
; vcredist_x86.exe (MSVC V8) - copy and execute the redistributable installer
File "${VCREDIST_EXE}"
!if ${WIRESHARK_TARGET_PLATFORM} == "win32"
ExecWait '"$INSTDIR\vcredist_x86.exe"' $0
!else
; If the user already has the redistributable installed they will see a
; Big Ugly Dialog by default, asking if they want to uninstall or repair.
; Ideally we should add a checkbox for this somewhere. In the meantime,
; just do a silent install.
ExecWait '"$INSTDIR\vcredist_x86.exe" /q' $0
!else
ExecWait '"$INSTDIR\vcredist_x64.exe" /q' $0
!endif ; WIRESHARK_TARGET_PLATFORM
DetailPrint "vcredist_x86 returned $0"