1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-06 11:00:13 +02:00

Merge branch 'improve_gradlew-fdroid' into 'master'

Improve gradlew fdroid

See merge request fdroid/fdroidserver!535
This commit is contained in:
Hans-Christoph Steiner 2018-07-13 16:53:50 +00:00
commit be54f1e82a

View File

@ -17,6 +17,7 @@ run_gradle() {
if [ ! -d "${gradle_version_dir}/${v_found}" ]; then if [ ! -d "${gradle_version_dir}/${v_found}" ]; then
download_gradle ${v_found} download_gradle ${v_found}
fi fi
echo "Running ${gradle_version_dir}/${v_found}/bin/gradle ${args[@]}"
"${gradle_version_dir}/${v_found}/bin/gradle" "${args[@]}" "${gradle_version_dir}/${v_found}/bin/gradle" "${args[@]}"
exit $? exit $?
} }
@ -41,8 +42,8 @@ download_gradle() {
else else
tmpdir=$(mktemp -d) tmpdir=$(mktemp -d)
fi fi
curl -o "${tmpdir}/gradle.zip" --silent --fail --show-error --location "${URL}" curl -o "${tmpdir}/gradle-$1-bin.zip" --silent --fail --show-error --location "${URL}"
gradle_zip="${tmpdir}/gradle.zip" gradle_zip="${tmpdir}/gradle-$1-bin.zip"
fi fi
echo "${shasum} ${gradle_zip}" | sha256sum -c - echo "${shasum} ${gradle_zip}" | sha256sum -c -
if [ $? != 0 ]; then if [ $? != 0 ]; then