diff options
| author | Andre Heinecke <aheinecke@intevation.de> | 2016-12-19 15:10:44 +0100 |
|---|---|---|
| committer | Andre Heinecke <aheinecke@intevation.de> | 2016-12-19 15:15:50 +0100 |
| commit | 026bbf0d5ee4510967e5f1dd3db2dee4687b0612 (patch) | |
| tree | 2d1c003089bedede9b02f9e1b9f1d2276c161223 /build-aux/speedo | |
| parent | Remove unused debug flags and add "dns" and "network". (diff) | |
| download | gnupg2-026bbf0d5ee4510967e5f1dd3db2dee4687b0612.tar.xz gnupg2-026bbf0d5ee4510967e5f1dd3db2dee4687b0612.zip | |
speedo,w32: Use nsExec::ExecToLog to avoid popups
* build-aux/speedo/w32/inst.nsi: Use ExecToLog instead of
ExecWait.
--
nsExec is a standard nsis call to spawn a process and
wait for it to finish. ExecToLog redirects stdout and stderr
of the process call and adds it to the log window instead
of opening a temporary console window.
Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
Diffstat (limited to 'build-aux/speedo')
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index 24d5d4d27..164e26bc3 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -545,15 +545,16 @@ Section "-gnupginst" # If we are reinstalling, try to kill a possible running gpa using # an already installed gpa. ifFileExists "$INSTDIR\bin\launch-gpa.exe" 0 no_uiserver - ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server' + nsExec::ExecToLog '"$INSTDIR\bin\launch-gpa" "--stop-server"' no_uiserver: # If we are reinstalling, try to kill a possible running agent using # an already installed gpgconf. + ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf - ExecWait '"$INSTDIR\bin\gpgconf" --kill dirmngr' - ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' no_gpgconf: @@ -976,7 +977,7 @@ ${If} ${RunningX64} # RegDLL can't be used for 64 bit and InstallLib seems to be a # registry hack. ClearErrors - ExecWait '"$SYSDIR\regsvr32" /s "$INSTDIR\bin\gpgex6.dll"' + nsExec::ExecToLog '"$SYSDIR\regsvr32" "/s" "$INSTDIR\bin\gpgex6.dll"' ifErrors 0 +2 MessageBox MB_OK "$(T_GPGEX_RegFailed) (64 bit)" @@ -1007,11 +1008,11 @@ SectionEnd Section "-un.gnupglast" ifFileExists "$INSTDIR\bin\launch-gpa.exe" 0 no_uiserver - ExecWait '"$INSTDIR\bin\launch-gpa" --stop-server' + nsExec::ExecToLog '"$INSTDIR\bin\launch-gpa" "--stop-server"' no_uiserver: ifFileExists "$INSTDIR\bin\gpgconf.exe" 0 no_gpgconf - ExecWait '"$INSTDIR\bin\gpgconf" --kill gpg-agent' - ExecWait '"$INSTDIR\bin\gpgconf" --kill dirmngr' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "gpg-agent"' + nsExec::ExecToLog '"$INSTDIR\bin\gpgconf" "--kill" "dirmngr"' no_gpgconf: SectionEnd @@ -1021,7 +1022,7 @@ Section "-un.gpgex" Delete /REBOOTOK "$INSTDIR\bin\gpgex.dll" ${If} ${RunningX64} - ExecWait '"$SYSDIR\regsvr32" /u /s "$INSTDIR\bin\gpgex6.dll"' + nsExec::ExecToLog '"$SYSDIR\regsvr32" "/u" "/s" "$INSTDIR\bin\gpgex6.dll"' Delete /REBOOTOK "$INSTDIR\bin\gpgex6.dll" ${EndIf} SectionEnd |