Merge branch 'fix-pkgrel-pkgver-match' into 'master'

fix(pkgbuild.sh): Use grep -Fx to check for pkgrel and pkgver declaration

Closes #242

See merge request archlinux/devtools!283

src/archbuild.in

@@ -80,7 +80,7 @@ check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAG
 makechrootpkg_args+=("${@:$OPTIND}")
 
 # Automatically recreate the root chroot if a version mismatch is detected
-CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot" 2>/dev/null)
+CURRENT_CHROOT_VERSION=$(cat "${chroots}/${repo}-${arch}/root/.arch-chroot")
 if [[ -f "${chroots}/${repo}-${arch}/root/.arch-chroot" ]] && [[ "$CURRENT_CHROOT_VERSION" != "$CHROOT_VERSION" ]]; then
 	warning "Recreating chroot '%s' (%s) as it is not at version %s" "${chroots}/${repo}-${arch}/root" "$CURRENT_CHROOT_VERSION" "$CHROOT_VERSION"
 	clean_first=true

src/lib/util/pkgbuild.sh

@@ -26,7 +26,7 @@ pkgbuild_set_pkgver() {
 		warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
 	fi
 
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD; then
+	if ! grep -Fx --quiet --max-count=1 "pkgver=${pkgver}" PKGBUILD; then
 		die "Non-standard pkgver declaration"
 	fi
 	sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${new_pkgver}|g" --in-place PKGBUILD
@@ -38,7 +38,7 @@ pkgbuild_set_pkgrel() {
 	local new_pkgrel=$1
 	local pkgrel=${pkgrel}
 
-	if ! grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD; then
+	if ! grep -Fx --quiet --max-count=1 "pkgrel=${pkgrel}" PKGBUILD; then
 		die "Non-standard pkgrel declaration"
 	fi
 	sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${new_pkgrel}|g" --in-place PKGBUILD