diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-12-12 19:22:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-12 19:22:33 +0100 |
commit | eff986bfc42c450ebca075a9a2b59940d5cd8e33 (patch) | |
tree | 39e7aed288856a36c5a4e7e4edb59bc31547be41 /platform/android/gradlew | |
parent | 6fb24b20823bf97ff42fd52352db7b15026dfe75 (diff) | |
download | qtlocation-mapboxgl-eff986bfc42c450ebca075a9a2b59940d5cd8e33.tar.gz |
[android] - update gradle wrapper and gradle plugin (#7381)
Diffstat (limited to 'platform/android/gradlew')
-rwxr-xr-x | platform/android/gradlew | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/platform/android/gradlew b/platform/android/gradlew index 27309d9231..4453ccea33 100755 --- a/platform/android/gradlew +++ b/platform/android/gradlew @@ -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" "$@" |