[cpp-sp COMMIT] in /branches/REL_2/configs: keygen.bat keygen.bat-wix

[noreply at shibboleth.net]

Author: scantor
Date: Sat May 19 00:47:49 2012
New Revision: 3671

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3671&view=rev
Log:
Merge path change and bug fixes back into original keygen script.

Removed:
    branches/REL_2/configs/keygen.bat-wix
Modified:
    branches/REL_2/configs/keygen.bat

Modified: branches/REL_2/configs/keygen.bat
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/configs/keygen.bat?rev=3671&r1=3670&r2=3671&view=diff
==============================================================================
--- branches/REL_2/configs/keygen.bat (original)
+++ branches/REL_2/configs/keygen.bat Sat May 19 00:47:49 2012
@@ -29,7 +29,7 @@
 if not defined FQDN goto guess_fqdn
 
 :generate
-set PATH=%PREFIX%..\..\lib;%PREFIX%..\..\bin
+set PATH=%PATH%;%ProgramFiles%\Shibboleth\SP\lib\
 set CNF="%PREFIX%sp-cert.cnf"
 echo # OpenSSL configuration file for creating sp-cert.pem    >%CNF%
 echo [req]                                                   >>%CNF%
@@ -46,7 +46,7 @@
 echo [ext]                                                   >>%CNF%
 if defined ENTITYID (echo subjectAltName=DNS:%FQDN%,URI:%ENTITYID% >>%CNF%) else (echo subjectAltName=DNS:%FQDN% >>%CNF%)
 echo subjectKeyIdentifier=hash                               >>%CNF%
-%PREFIX%..\..\bin\openssl.exe req -config %PREFIX%sp-cert.cnf -new -x509 -days %DAYS% -keyout %PREFIX%sp-key.pem -out %PREFIX%sp-cert.pem
+openssl.exe req -config %CNF% -new -x509 -days %DAYS% -keyout "%PREFIX%sp-key.pem" -out "%PREFIX%sp-cert.pem"
 del %CNF%
 exit /b
 
@@ -92,7 +92,7 @@
 for /F %%i in ('hostname') do set HOST=%%i
 if defined FQDN (set FQDN=%HOST%.%FQDN%) else (set FQDN=%HOST%)
 
-echo >%FQDN%
+echo >"%FQDN%"
 for /F %%i in ('dir /b/l %FQDN%') do set FQDN=%%i
 del %FQDN%
 goto generate