Skip to content

Commit dbc0d43

Browse files
committed
msys2-runtime(update-patches): fix pkgrel incrementing logic
When the `pkgver` was changed, we want to reset it to 1, otherwise increment it. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e97e100 commit dbc0d43

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

msys2-runtime/update-patches.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,11 @@ updpkgsums ||
7777
die "Could not update the patch set checksums in PKGBUILD"
7878

7979
# bump pkgrel
80-
if ! git diff @{u} -- PKGBUILD | grep -q '^+pkgver'
80+
if test -n "$(git diff @{u} -- PKGBUILD | grep '^+pkgver')"
8181
then
82+
sed -i -e "s/^\(pkgrel=\).*/\11/" PKGBUILD ||
83+
die "Could not reset pkgrel"
84+
else
8285
pkgrel=$((1+$(sed -n -e 's/^pkgrel=//p' <PKGBUILD))) &&
8386
sed -i -e "s/^\(pkgrel=\).*/\1$pkgrel/" PKGBUILD ||
8487
die "Could not increment pkgrel"

0 commit comments

Comments
 (0)