Fix PKGBUILDs that apply patches w/o explicit "exit 1" on fail

mk-fg · Mar 11, 2023 · ad9fc7a · ad9fc7a
1 parent 978e1b4
commit ad9fc7a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/libfido2-pcsc/PKGBUILD b/libfido2-pcsc/PKGBUILD
@@ -17,8 +17,9 @@ for p in ${_patches[@]}; do source+=($p); sha256sums+=(SKIP); done
 
 prepare() {
   cd libfido2-${pkgver}
-	for p in ${_patches[@]}
-	do patch --dry-run -tNp1 -i "$srcdir"/$p >/dev/null && patch -tNp1 -i "$srcdir"/$p
+	for p in ${_patches[@]}; do
+		patch --dry-run -tNp1 -i "$srcdir"/$p >/dev/null \
+			&& patch -tNp1 -i "$srcdir"/$p || { echo >&2 "ERROR: patch failed - $p"; exit 1; }
 	done
 }
 

diff --git a/re2g-git/PKGBUILD b/re2g-git/PKGBUILD
@@ -2,7 +2,7 @@ _p=re2g
 
 pkgname=${_p}-git
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="A grep-alike built on re2 pcre-like fast regexp library."
 arch=(i686 x86_64)
 url='https://github.com/akamai/re2g'
@@ -17,13 +17,14 @@ for p in ${_patches[@]}; do source+=($p); sha256sums+=(SKIP); done
 
 pkgver() {
 	cd $_p
-	printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	printf "%s.%s.$pkgrel" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
 	cd $_p
-	for p in ${_patches[@]}
-	do patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null || patch -tNp1 -i "$srcdir"/$p
+	for p in ${_patches[@]}; do
+		patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null \
+			|| patch -tNp1 -i "$srcdir"/$p || { echo >&2 "ERROR: patch failed - $p"; exit 1; }
 	done
 }
 

diff --git a/telegram-tdlib-purple-git/PKGBUILD b/telegram-tdlib-purple-git/PKGBUILD
@@ -25,7 +25,7 @@ prepare() {
 	cd $pkgname
 	# See https://github.com/ars3niy/tdlib-purple/pull/154
 	p=PR154-fix-build-with-tdlib-1.8.0.patch
-	patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null || patch -tNp1 -i "$srcdir"/$p
+	patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null || patch -tNp1 -i "$srcdir"/$p || exit 1
 }
 
 build() {

diff --git a/telegram-tdlib-purple-minimal-git/PKGBUILD b/telegram-tdlib-purple-minimal-git/PKGBUILD
@@ -25,7 +25,7 @@ prepare() {
 	cd $pkgname
 	# See https://github.com/ars3niy/tdlib-purple/pull/154
 	p=PR154-fix-build-with-tdlib-1.8.0.patch
-	patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null || patch -tNp1 -i "$srcdir"/$p
+	patch --dry-run -tNp1 -R -i "$srcdir"/$p >/dev/null || patch -tNp1 -i "$srcdir"/$p || || exit 1
 }
 
 build() {