summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2017-02-12 20:59:07 -0800
committerLlewelyn Trahaearn2017-02-12 20:59:07 -0800
commit500bc16b2ff8971b9d797c78a4c5834582155e9f (patch)
treee8b731da8ecc5ac69e19bc8a5e4e7a1677528597
parente017fa42d9444308eddae557c1b78327d6fc2827 (diff)
downloadaur-500bc16b2ff8971b9d797c78a4c5834582155e9f.tar.gz
Fix pkgver() to trim 'grub.' out of the git tags.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3d0d1bda63a..9a449ffb734e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Feb 11 17:30:54 UTC 2017
+# Mon Feb 13 04:58:08 UTC 2017
pkgbase = grub-git
pkgdesc = GNU GRand Unified Bootloader (2)
- pkgver = grub.2.02.rc1.r3.g529818738
+ pkgver = 2.02.rc1.r4.g2fb8cd26a
pkgrel = 1
url = https://www.gnu.org/software/grub/
install = grub-git.install
diff --git a/PKGBUILD b/PKGBUILD
index b177c68afe91..adc0fd49394b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _UNIFONT_VER="9.0.06"
[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
pkgname="grub-git"
-pkgver=grub.2.02.rc1.r3.g529818738
+pkgver=2.02.rc1.r4.g2fb8cd26a
pkgrel=1
pkgdesc="GNU GRand Unified Bootloader (2)"
arch=('x86_64' 'i686')
@@ -108,7 +108,7 @@ prepare() {
pkgver() {
cd grub
( set -o pipefail
- git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+ git describe --long --tags 2>/dev/null | sed 's/^grub.//;s/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
)
}