update pkgver generation

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd68584376e3..7fb45f9b1b95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = resources-git
 	pkgdesc = Monitor your system resources and processes
-	pkgver = r122.5505e30
-	pkgrel = 2
+	pkgver = 1.0.0.r0.ge8d27b1
+	pkgrel = 1
 	url = https://github.com/nokyan/resources
 	arch = x86_64
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index abcd2ac13b44..3d86e4121598 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=resources-git
-pkgver=r122.5505e30
-pkgrel=2
+pkgver=1.0.0.r0.ge8d27b1
+pkgrel=1
 pkgdesc="Monitor your system resources and processes"
 arch=('x86_64')
 url="https://github.com/nokyan/resources"
@@ -15,21 +15,21 @@ source=('git+https://github.com/nokyan/resources.git')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/${pkgname%-git}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${pkgname%-git}"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "$srcdir/${pkgname%-git}"
+  cd "${pkgname%-git}"
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=nightly
   cargo fetch --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  arch-meson "${pkgname%-git}" build
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=nightly
+  arch-meson "${pkgname%-git}" build
   meson compile -C build
 }