mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-07-04 16:30:12 +02:00
gradlew-fdroid: fix multiple gradle-wrapper.properties parsing
Stop looking for the Gradle version if we found it via distributionUrl in ./gradle/wrapper/gradle-wrapper.properties. If we go on to parsing ../gradle/wrapper/gradle-wrapper.properties, we'll erroneously get the version from there.
This commit is contained in:
parent
aa47e93f36
commit
8e471ad856
|
@ -145,6 +145,7 @@ for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
|
||||||
while read l; do
|
while read l; do
|
||||||
if [[ $l == 'distributionUrl='* ]]; then
|
if [[ $l == 'distributionUrl='* ]]; then
|
||||||
wrapper_ver=$(echo -n "$l" | sed "s/.*gradle-\\([0-9\\.\\+]\\+\\).*/\\1/")
|
wrapper_ver=$(echo -n "$l" | sed "s/.*gradle-\\([0-9\\.\\+]\\+\\).*/\\1/")
|
||||||
|
break 2
|
||||||
fi
|
fi
|
||||||
done < $f
|
done < $f
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue
Block a user