Merge pull request #2811 from travisfw/master
fix tests for java executable location in gradlew to be compatible with bash 4.3.42
This commit is contained in:
commit
528e2e8d61
1 changed files with 2 additions and 2 deletions
4
gradlew
vendored
4
gradlew
vendored
|
@ -64,13 +64,13 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -xPx "$JAVA_HOME/jre/sh/java" ] ; 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
|
||||
if [ ! -xPx "$JAVACMD" ] ; then
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
|
|
Loading…
Add table
Reference in a new issue