[java-identity-provider] 01/02: Remove AIX support from runclass.sh

Rod Widdowson rdw at steadingsoftware.com
Mon Aug 12 14:18:21 UTC 2024


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

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

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

commit e0709339bc29fd12f4f35a257fa3b173bb09ca35
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Aug 10 16:38:55 2024 +0100

    Remove AIX support from runclass.sh
---
 .../src/main/resources/net/shibboleth/idp/module/bin/runclass.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
index 807fbc372..6d58d4d6c 100755
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/bin/runclass.sh
@@ -10,12 +10,7 @@ LOCATION=$(dirname $0)
 
 if [ -z "$JAVACMD" ] ; then 
   if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-      JAVACMD=$JAVA_HOME/bin/java
-    fi
+    JAVACMD=$JAVA_HOME/bin/java
   else
     JAVACMD=$(which java)
   fi
@@ -54,4 +49,4 @@ if [ -n "$JAVA_HOME" ] ; then
   fi
 fi
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JAVA_OPTS -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@" $SHIB_OPTS
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" $JAVA_OPTS -Dnet.shibboleth.idp.cli.baseURL=$IDP_BASE_URL "$@" $SHIB_OPTS

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


More information about the commits mailing list