diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2010-12-01 20:48:44 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2010-12-01 20:48:44 +0000 |
| commit | 68241fa66fd077707831586e6d599d55fbad3afd (patch) | |
| tree | e2f133889d9ee80b6a841f50de9a0669bd7289c5 /packaging | |
| parent | 462245684a2fbc7daaa135ccb1f6406f9be22b8f (diff) | |
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
Diffstat (limited to 'packaging')
| -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 7f67d9cdd5..a3e902b5d6 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -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" |