mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
Merge branch 'gradlew_no_eol' into 'master'
gradlew-fdroid: support parsing files with no EOL before EOF See merge request fdroid/fdroidserver!707
This commit is contained in:
commit
e049a120f8
@ -158,7 +158,7 @@ v_all=${plugin_v[@]}
|
|||||||
# Earliest takes priority
|
# Earliest takes priority
|
||||||
for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
|
for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do
|
||||||
[[ -f $f ]] || continue
|
[[ -f $f ]] || continue
|
||||||
while read -r line; do
|
while IFS='' read -r line || [ -n "$line" ]; do
|
||||||
if [[ $line == 'distributionUrl='* ]]; then
|
if [[ $line == 'distributionUrl='* ]]; then
|
||||||
wrapper_ver=${line#*/gradle-}
|
wrapper_ver=${line#*/gradle-}
|
||||||
wrapper_ver=${wrapper_ver%-*.zip}
|
wrapper_ver=${wrapper_ver%-*.zip}
|
||||||
@ -176,7 +176,7 @@ fi
|
|||||||
# Earliest takes priority
|
# Earliest takes priority
|
||||||
for f in {.,..}/build.gradle; do
|
for f in {.,..}/build.gradle; do
|
||||||
[[ -f $f ]] || continue
|
[[ -f $f ]] || continue
|
||||||
while read -r line; do
|
while IFS='' read -r line || [ -n "$line" ]; do
|
||||||
if [[ -z "$plugin_pver" && $line == *'com.android.tools.build:gradle:'* ]]; then
|
if [[ -z "$plugin_pver" && $line == *'com.android.tools.build:gradle:'* ]]; then
|
||||||
plugin_pver=${line#*[\'\"]com.android.tools.build:gradle:}
|
plugin_pver=${line#*[\'\"]com.android.tools.build:gradle:}
|
||||||
plugin_pver=${plugin_pver%[\'\"]*}
|
plugin_pver=${plugin_pver%[\'\"]*}
|
||||||
|
Loading…
Reference in New Issue
Block a user