diff options
| author | Craig Scott <craig.scott@crascit.com> | 2016-09-27 02:19:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-27 12:27:24 (GMT) |
| commit | cb8db285595138df513432294d55c1a8364454e5 (patch) | |
| tree | c70bbb597778a9829ce84eca75947ccf48587f57 | |
| parent | 1a5fddfe6d56733528ace3d15899b0739ea28054 (diff) | |
| download | CMake-cb8db285595138df513432294d55c1a8364454e5.zip CMake-cb8db285595138df513432294d55c1a8364454e5.tar.gz CMake-cb8db285595138df513432294d55c1a8364454e5.tar.bz2 | |
CPack/NSIS: Fix silent NSIS installs
The installer should not put up a message box to confirm uninstall of a
previous version for silent installs. Furthermore, when the uninstaller
is invoked, do not show its confirmation dialog because either (a) the
installer already asked the user or (b) the installer is running in
silent mode.
Closes: #16328
| -rw-r--r-- | Modules/NSIS.template.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index c66a89b..9001888 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -905,7 +905,7 @@ Function .onInit MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \ "@CPACK_NSIS_PACKAGE_NAME@ is already installed. $\n$\nDo you want to uninstall the old version before installing the new one?" \ - IDYES uninst IDNO inst + /SD IDYES IDYES uninst IDNO inst Abort ;Run the uninstaller @@ -913,7 +913,7 @@ uninst: ClearErrors StrLen $2 "\Uninstall.exe" StrCpy $3 $0 -$2 # remove "\Uninstall.exe" from UninstallString to get path - ExecWait '"$0" _?=$3' ;Do not copy the uninstaller to a temp file + ExecWait '"$0" /S _?=$3' ;Do not copy the uninstaller to a temp file IfErrors uninst_failed inst uninst_failed: |