From 486c4f5f29d014e67b9b84f99eda98acfc5048dc Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 28 Jan 2019 09:41:41 +0100 Subject: update-archlinux32-package: python-pip-bootstrap needs bump of pkgver, too --- update-archlinux32-package | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/update-archlinux32-package b/update-archlinux32-package index 5418d09..b92505f 100755 --- a/update-archlinux32-package +++ b/update-archlinux32-package @@ -93,8 +93,9 @@ case "${pkgname}" in update_path='checksum' ;; 'python-pip-bootstrap') - # a package without upstream which is updated by solely updating its checksum - update_path='checksum without upstream' + # a package without upstream which is updated by updating its + # version (according to watch-versions) and checksum + update_path='version and checksum without upstream' ;; 'linux'|'linux-lts'|'linux-zen') # a kernel which exists upstream -> different config and checksums @@ -236,7 +237,24 @@ case ${update_path} in fi git -C "${git_repo_path}" commit "${repo}/${pkgname}/PKGBUILD" -m "${repo}/${pkgname}: new version => new checksum" ;; - 'checksum without upstream') + 'version and checksum without upstream') + newver=$( + "$(dirname "$(readlink -e "$0")")/watch-versions" -m "${pkgname}" \ + | sed ' + s/^newver="\([^"]\+\)";$/\1/ + t + d + ' + ) + if [ -z "${newver}" ]; then + >&2 printf 'watch-versions reports no new version for %s\n' "${pkgname}" + exit + fi + sed -i ' + s/^pkgver=.*$/pkgver='"'${newver}'"'/ + s/^pkgrel=.*$/pkgrel='"'1'"'/ + ' "${git_repo_path}/${repo}/${pkgname}/PKGBUILD" + git -C "${git_repo_path}/${repo}/${pkgname}" diff HEAD -- PKGBUILD scp -r "${git_repo_path}/${repo}/${pkgname}" \ "arch32-test:${pkgname}" sums=$( -- cgit v1.2.3