|
@@ -1,4 +1,4 @@
|
|
|
-#!/usr/bin/env bash
|
|
|
+#!/usr/bin/env sh
|
|
|
|
|
|
##############################################################################
|
|
|
##
|
|
@@ -154,11 +154,19 @@ if $cygwin ; then
|
|
|
esac
|
|
|
fi
|
|
|
|
|
|
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
|
|
-function splitJvmOpts() {
|
|
|
- JVM_OPTS=("$@")
|
|
|
+# Escape application args
|
|
|
+save ( ) {
|
|
|
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
|
|
+ echo " "
|
|
|
}
|
|
|
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
|
|
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
|
|
+APP_ARGS=$(save "$@")
|
|
|
|
|
|
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
|
|
+# Collect all arguments for the java command, following the shell quoting and substitution rules
|
|
|
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
|
|
+
|
|
|
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
|
|
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|
|
+ cd "$(dirname "$0")"
|
|
|
+fi
|
|
|
+
|
|
|
+exec "$JAVACMD" "$@"
|