[java-identity-provider] 01/03: IDP-1595 Make idp.home available to all programs run via runclass

[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=aa37f616807a1b8f39ddfb801230ab26ed80e17d

commit aa37f616807a1b8f39ddfb801230ab26ed80e17d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 28 14:48:01 2020 +0100

    IDP-1595 Make idp.home available to all programs run via runclass
    
    https://issues.shibboleth.net/jira/browse/IDP-1595
---
 idp-distribution/src/main/resources/bin/runclass.bat | 2 +-
 idp-distribution/src/main/resources/bin/runclass.sh  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/runclass.bat b/idp-distribution/src/main/resources/bin/runclass.bat
index 400b8a044..b62fc6145 100644
--- a/idp-distribution/src/main/resources/bin/runclass.bat
+++ b/idp-distribution/src/main/resources/bin/runclass.bat
@@ -26,4 +26,4 @@ set LOCALCLASSPATH=%~dp0lib\*;%~dp0..\edit-webapp\WEB-INF\lib\*;%~dp0..\dist\web
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dnet.shibboleth.idp.cli.baseURL=%IDP_BASE_URL% %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dnet.shibboleth.idp.cli.baseURL=%IDP_BASE_URL% -Dnet.shibboleth.idp.cli.idp.home=%~dp0.. %*
diff --git a/idp-distribution/src/main/resources/bin/runclass.sh b/idp-distribution/src/main/resources/bin/runclass.sh
index ad3826f52..fe4196814 100755
--- a/idp-distribution/src/main/resources/bin/runclass.sh
+++ b/idp-distribution/src/main/resources/bin/runclass.sh
@@ -4,7 +4,6 @@ declare LOCATION
 declare COMMAND
 declare JAVACMD
 declare LOCALCLASSPATH
-declare LIBDIR
 
 LOCATION=$(dirname $0)
 
@@ -50,4 +49,4 @@ if [ -n "$JAVA_HOME" ] ; then
   fi
 fi
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@"
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL -Dnet.shibboleth.idp.cli.idp.home=$LOCATION/.. "$@"
\ No newline at end of file

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