mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: fix updating PKGBUILD when building SCM packages
Fixes a bug and resets pkgrel to 1 when bumping pkgver Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
50e3dc02bf
commit
1e656c0a6a
@ -1069,6 +1069,7 @@ devel_check() {
|
|||||||
if [ "$newpkgver" != "" ]; then
|
if [ "$newpkgver" != "" ]; then
|
||||||
msg2 "$(gettext "Version found: %s")" "$newpkgver"
|
msg2 "$(gettext "Version found: %s")" "$newpkgver"
|
||||||
pkgver=$newpkgver
|
pkgver=$newpkgver
|
||||||
|
pkgrel=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
@ -1088,8 +1089,9 @@ devel_update() {
|
|||||||
# _foo=pkgver
|
# _foo=pkgver
|
||||||
#
|
#
|
||||||
if [ "$newpkgver" != "" ]; then
|
if [ "$newpkgver" != "" ]; then
|
||||||
if [ "newpkgver" != "$pkgver" ]; then
|
if [ "$newpkgver" != "$pkgver" ]; then
|
||||||
sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT
|
sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT
|
||||||
|
sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT
|
||||||
source $BUILDSCRIPT
|
source $BUILDSCRIPT
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user