|
83 | 83 | # This is normally unused
|
84 | 84 | # shellcheck disable=SC2034
|
85 | 85 | APP_BASE_NAME=${0##*/}
|
86 |
| -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit |
87 |
| - |
88 |
| -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
89 |
| -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' |
| 86 | +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) |
| 87 | +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit |
90 | 88 |
|
91 | 89 | # Use the maximum available, or set MAX_FD != -1 to use that value.
|
92 | 90 | MAX_FD=maximum
|
@@ -133,10 +131,13 @@ location of your Java installation."
|
133 | 131 | fi
|
134 | 132 | else
|
135 | 133 | JAVACMD=java
|
136 |
| - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |
| 134 | + if ! command -v java >/dev/null 2>&1 |
| 135 | + then |
| 136 | + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. |
137 | 137 |
|
138 | 138 | Please set the JAVA_HOME variable in your environment to match the
|
139 | 139 | location of your Java installation."
|
| 140 | + fi |
140 | 141 | fi
|
141 | 142 |
|
142 | 143 | # Increase the maximum file descriptors if we can.
|
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
|
197 | 198 | done
|
198 | 199 | fi
|
199 | 200 |
|
| 201 | + |
| 202 | +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. |
| 203 | +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' |
| 204 | + |
200 | 205 | # Collect all arguments for the java command;
|
201 | 206 | # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
202 | 207 | # shell script including quotes and variable substitutions, so put them in
|
|
0 commit comments