fix pkgver() function

This commit is contained in:
Greyson Christoforo 2020-11-20 18:14:12 +00:00
parent 98256b0b94
commit d57a5fcb92
2 changed files with 6 additions and 7 deletions

View file

@ -1,7 +1,7 @@
pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout
pkgver = 0.18.r6973.gc4d42a1f74
pkgrel = 2
pkgver = 0.19_pre.r4405.gc4d42a1f74
pkgrel = 1
epoch = 0
url = https://www.freecadweb.org/
arch = x86_64

View file

@ -2,8 +2,8 @@
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
pkgname=freecad-git
pkgver=0.18.r6973.gc4d42a1f74
pkgrel=2
pkgver=0.19_pre.r4405.gc4d42a1f74
pkgrel=1
epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout'
arch=('x86_64')
@ -20,9 +20,8 @@ source=("git+https://github.com/FreeCAD/FreeCAD.git")
md5sums=('SKIP')
pkgver() {
cd "${srcdir}/FreeCAD"
# upstream recyles the "pre" and "staging" tags so they do not produce stable commit counts
git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
cd FreeCAD
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {