Handle paths with spaces in them

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3669 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/keygen.bat-wix b/configs/keygen.bat-wix
index 45c9e11..b2ba408 100644 (file)
--- a/configs/keygen.bat-wix
+++ b/configs/keygen.bat-wix
@@ -46,7 +46,7 @@ echo CN=%FQDN%                                               >>%CNF%
 echo [ext]                                                   >>%CNF%\r
 if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)\r
 echo subjectKeyIdentifier=hash                               >>%CNF%\r
-openssl.exe req -config %PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem\r
+openssl.exe req -config %CNF% -new -x509 -days %DAYS% -keyout "%PREFIX%sp-key.pem" -out "%PREFIX%sp-cert.pem"\r
 del %CNF%\r
 exit /b\r
 \r
@@ -92,7 +92,7 @@ if defined USERDNSDOMAIN set FQDN=%USERDNSDOMAIN%
 for /F %%i in ('hostname') do set HOST=%%i\r
 if defined FQDN (set FQDN=%HOST%.%FQDN%) else (set FQDN=%HOST%)\r
 \r
-echo >%FQDN%\r
+echo >"%FQDN%"\r
 for /F %%i in ('dir /b/l %FQDN%') do set FQDN=%%i\r
 del %FQDN%\r
 goto generate\r