From 09db49355712e71dd8d9165aab744bc23049e233 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 21 Jan 2020 11:15:51 +0100 Subject: [PATCH] gradlew-fdroid: support parsing files with no EOL before EOF Fixes cases like: https://gitlab.com/fdroid/fdroiddata/merge_requests/6216#note_273985937 --- gradlew-fdroid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradlew-fdroid b/gradlew-fdroid index b4e48857..520cfbea 100755 --- a/gradlew-fdroid +++ b/gradlew-fdroid @@ -156,7 +156,7 @@ v_all=${plugin_v[@]} # Earliest takes priority for f in {.,..}/gradle/wrapper/gradle-wrapper.properties; do [[ -f $f ]] || continue - while read -r line; do + while IFS='' read -r line || [ -n "$line" ]; do if [[ $line == 'distributionUrl='* ]]; then wrapper_ver=${line#*/gradle-} wrapper_ver=${wrapper_ver%-*.zip} @@ -174,7 +174,7 @@ fi # Earliest takes priority for f in {.,..}/build.gradle; do [[ -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 plugin_pver=${line#*[\'\"]com.android.tools.build:gradle:} plugin_pver=${plugin_pver%[\'\"]*}