[java-identity-provider] branch master updated: IDP-1584 fix quotes issue in build.bat (around logging)

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=041123e11d24e4a433401c660f0eede03fb2eece

The following commit(s) were added to refs/heads/master by this push:
       new  041123e   IDP-1584 fix quotes issue in build.bat (around logging)
041123e is described below

commit 041123e11d24e4a433401c660f0eede03fb2eece
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Mar 17 10:52:39 2020 +0000

    IDP-1584 fix quotes issue in build.bat (around logging)
    
    https://issues.shibboleth.net/jira/browse/IDP-1584
---
 idp-distribution/src/main/resources/bin/ant.bat | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/ant.bat b/idp-distribution/src/main/resources/bin/ant.bat
index bd64f6c..c08a948 100644
--- a/idp-distribution/src/main/resources/bin/ant.bat
+++ b/idp-distribution/src/main/resources/bin/ant.bat
@@ -12,9 +12,11 @@ if "%ANT_HOME:~-1%" NEQ "\" (
 set ANT_HOME=%ANT_HOME:~0,-1%
 :nostrip
 
-if not defined INSTALL_LOG_FILE (
-   set INSTALL_LOG_FILE=%ANT_HOME%\install-log.xml
+if defined INSTALL_LOG_FILE (
+   goto got_log
 )
+set INSTALL_LOG_FILE=%ANT_HOME%\install-log.xml
+:got_log
 
 REM We need a JVM
 if not defined JAVA_HOME  (
@@ -35,4 +37,4 @@ if not exist %JAVACMD% (
 REM add in the dependency .jar files
 set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\webapp\WEB-INF\lib\*;%ANT_HOME%\..\dist\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dlogback.configurationFile=%INSTALL_LOG_FILE% -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f "%ANT_HOME%/build.xml" %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dlogback.configurationFile="%INSTALL_LOG_FILE%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f "%ANT_HOME%/build.xml" %*

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.