[java-identity-provider] 02/02: IDP-1524 - Refresh scripts used by the installer

[Scott Cantor]

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

scantor pushed a commit to branch maint-3.4
in repository java-identity-provider.

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

commit 844954f2fa1a72c86b911a72108182dea290d6e1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 14 14:27:13 2020 -0400

    IDP-1524 - Refresh scripts used by the installer
    
    https://issues.shibboleth.net/jira/browse/IDP-1524
    
    Fix Unix ant wrapper so JAVA_HOME is optional.
---
 idp-distribution/src/main/resources/bin/ant.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/idp-distribution/src/main/resources/bin/ant.sh b/idp-distribution/src/main/resources/bin/ant.sh
index 78b60e9d8..c133ef46b 100755
--- a/idp-distribution/src/main/resources/bin/ant.sh
+++ b/idp-distribution/src/main/resources/bin/ant.sh
@@ -21,7 +21,7 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD=$JAVA_HOME/bin/java
     fi
   else
-    JAVACMD=java
+    JAVACMD=$(which java)
   fi
 fi
  
@@ -59,12 +59,6 @@ if [ -n "$JAVA_HOME" ] ; then
       done
     fi
   fi
-
-else
-  echo "Warning: JAVA_HOME environment variable is not set."
-  echo "  If build fails because sun.* classes could not be found"
-  echo "  you will need to set the JAVA_HOME environment variable"
-  echo "  to the installation directory of java."
 fi
 
 # supply JIKESPATH to Ant as jikes.class.path

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