diff options
| author | bitraid <bitraid@protonmail.ch> | 2019-01-17 18:31:28 +0200 |
|---|---|---|
| committer | bitraid <bitraid@protonmail.ch> | 2019-01-17 18:31:28 +0200 |
| commit | 756bd2111177c6146b52b6a2ef1941bcd32c1c47 (patch) | |
| tree | 1fc16a7e2a547e6a5c04488410412a4199c85402 /misc/nsis | |
| parent | cc7ab995afb4c2ed3c1d777534139be0af79d9ca (diff) | |
| download | qutebrowser-756bd2111177c6146b52b6a2ef1941bcd32c1c47.tar.gz qutebrowser-756bd2111177c6146b52b6a2ef1941bcd32c1c47.zip | |
Use ExecShellWait instead of cmd when calling the old uninstallers
Diffstat (limited to 'misc/nsis')
| -rwxr-xr-x | misc/nsis/install.nsh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/misc/nsis/install.nsh b/misc/nsis/install.nsh index fdb242cab..cf9b7f169 100755 --- a/misc/nsis/install.nsh +++ b/misc/nsis/install.nsh @@ -135,9 +135,10 @@ var KeepReg ${endif} !macroend -!macro RemoveOld UninstCmd +!macro RemoveOld PRG ARGS ClearErrors - ExecWait "${UninstCmd}" + ; Using ExecShellWait so the EXE will get the elevation prompt. + ExecShellWait "open" "${PRG}" "${ARGS}" ${if} ${errors} MessageBox MB_ICONSTOP \ "The uninstaller has failed to complete.$\r$\n\ @@ -463,12 +464,10 @@ Function .onInit Abort ${if} $R0 != "" ${GetParent} $R0 $0 - ${GetFileName} $R0 $1 - ; Using cmd.exe for elevation to work - !insertmacro RemoveOld "cmd.exe /c start /wait /d $\"$0$\" $1 /S _?=$0" + !insertmacro RemoveOld $R0 "/S _?=$0" ${endif} ${if} $R1 != "" - !insertmacro RemoveOld "msiexec.exe /X$R1 /passive /promptrestart" + !insertmacro RemoveOld "msiexec.exe" "/X$R1 /passive /promptrestart" ${endif} ${endif} |