diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-03 10:31:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-03 10:34:58 +0000 |
| commit | 1cbc853155b99aa062b1f30dd4d2c29fb9576e20 (patch) | |
| tree | cfc9681e0e851ba42587312368f59092deee5a06 | |
| parent | c6609b4739bf45f76360f40c3be2f2b235f728bd (diff) | |
| download | abuild-1cbc853155b99aa062b1f30dd4d2c29fb9576e20.tar.gz abuild-1cbc853155b99aa062b1f30dd4d2c29fb9576e20.tar.bz2 abuild-1cbc853155b99aa062b1f30dd4d2c29fb9576e20.tar.xz abuild-1cbc853155b99aa062b1f30dd4d2c29fb9576e20.zip | |
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
| -rw-r--r-- | abuild.in | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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 |