mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

gradlew-fdroid: avoid sed

Browse source 
sed implementations (GNU sed vs. BSD sed) have variations in regex
syntax causing distributionUrl parsing to fail on macOS.
This commit is contained in:
relan 2019-09-22 08:56:39 +03:00
parent 944046b70b
commit 932ab4a3c1
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
gradlew-fdroid
View file

@ -152,9 +152,10 @@ 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 l; do while read -r line; do
if [[ $l == 'distributionUrl='* ]]; then if [[ $line == 'distributionUrl='* ]]; then
wrapper_ver=$(echo -n "$l" | sed "s/.*gradle-\\([0-9\\.\\+]\\+\\).*/\\1/") wrapper_ver=${line#*/gradle-}
wrapper_ver=${wrapper_ver%-*.zip}
break 2 break 2
fi fi
done < $f done < $f
@ -169,11 +170,13 @@ 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 l; do while read -r line; do
if [[ -z "$plugin_pver" && $l == *'com.android.tools.build:gradle:'* ]]; then if [[ -z "$plugin_pver" && $line == *'com.android.tools.build:gradle:'* ]]; then
plugin_pver=$(echo -n "$l" | sed "s/.*com.android.tools.build:gradle:\\([0-9\\.\\+]\\+\\).*/\\1/") plugin_pver=${line#*[\'\"]com.android.tools.build:gradle:}
elif [[ -z "$wrapper_ver" && $l == *'gradleVersion = '* ]]; then plugin_pver=${plugin_pver%[\'\"]*}
wrapper_ver=$(echo -n "$l" | sed "s/.*gradleVersion *=* *[\"']\\([0-9\\.]\\+\\)[\"'].*/\\1/") elif [[ -z "$wrapper_ver" && $line == *'gradleVersion = '* ]]; then
wrapper_ver=${line#*gradleVersion*=*[\'\"]}
wrapper_ver=${wrapper_ver%[\'\"]*}
fi fi
done < $f done < $f
done done