mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'gradlew_no_eol' into 'master'

Browse source 
gradlew-fdroid: support parsing files with no EOL before EOF

See merge request fdroid/fdroidserver!707
This commit is contained in:
Hans-Christoph Steiner 2020-02-13 09:47:07 +00:00
commit e049a120f8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradlew-fdroid
View file

@ -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%[\'\"]*}