From 1cbc853155b99aa062b1f30dd4d2c29fb9576e20 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 3 Oct 2018 10:31:09 +0000 Subject: abuild: fix checksum update Fix case where 1) checksum is a single line and 2) there is a variable under the checksum that should be kept. For example: sha512sum="...." keepthis="..." Previously the `keepthis` variable would have been removed. ref https://github.com/alpinelinux/abuild/pull/41 --- abuild.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'abuild.in') diff --git a/abuild.in b/abuild.in index d52c0bf..8a54061 100644 --- a/abuild.in +++ b/abuild.in @@ -2107,9 +2107,13 @@ checksum() { local s files [ -z "$source" ] && [ -n "${md5sums}${sha256sums}${sha512sums}" ] \ && msg "Removing checksums from APKBUILD" - sed -i -e '/^md5sums="/,/"\$/d; /^md5sums=''/,/''\$/d' "$APKBUILD" - sed -i -e '/^sha512sums="/,/"\$/d; /^sha512sums=''/,/''\$/d' "$APKBUILD" - sed -i -e '/^sha256sums="/,/"\$/d; /^sha256sums=''/,/''\$/d' "$APKBUILD" + sed -E -i -e '/^(md5|sha[0-9]+)sums=".*[^"]$/,/"$/d' \ + -e '/^(md5|sha[0-9]+)sums=".*"$/d' \ + \ + -e "/^(md5|sha[0-9]+)sums='.*[^']\$/,/'\$/d" \ + -e "/^(md5|sha[0-9]+)sums='.*'\$/d" \ + APKBUILD + [ -z "$source" ] && return 0 fetch for s in $source; do -- cgit v1.2.3-60-g2f50