Update package version, increase indentation

2 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4e9235f9027..754bccaa6330 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zrythm-git
 	pkgdesc = a highly automated and intuitive digital audio workstation
-	pkgver = 0.6.422
+	pkgver = 1.0.0.alpha.6.0.1.r.ged48d5c6e
 	pkgrel = 1
 	url = https://www.zrythm.org
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 169d832d8a20..609d48acf4cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Alexandros Theodotou <alex@zrythm.org>
+# Maintainer: Elijah Gregg <lovetocode999@ctrl-c.club>
+# Contributor: Alexandros Theodotou <alex@zrythm.org>
 _pkgname=zrythm
 pkgname=$_pkgname-git
-pkgver=0.6.422
+pkgver=1.0.0.alpha.6.0.1.r.ged48d5c6e
 pkgrel=1
 pkgdesc='a highly automated and intuitive digital audio workstation'
 arch=('x86_64' 'i686')
@@ -20,26 +21,27 @@ provides=("$_pkgname")
 source=("$_pkgname::git+https://git.zrythm.org/git/$_pkgname.git")
 md5sums=('SKIP')
 
-pkgver () {
-  cd "$srcdir/$_pkgname"
-  #printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  printf "%s" "$(git describe --tags | sed 's/-/\.r/' | sed 's/v//g' | sed 's/-/\./')"
+pkgver() {
+    cd "$srcdir/$_pkgname"
+
+    _tag=$(git tag --sort=v:refname | tail -n1 | sed 's/-/\./')
+    printf '%s.r%s.g%s' "${_tag#v}" "$(git rev-list "$_tag"..HEAD --count)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  meson build --prefix=/usr -Denable_tests=true -Duser_manual=true -Dmanpage=true
-  ninja -C build
+    cd "$srcdir/$_pkgname"
+    meson build --prefix=/usr -Denable_tests=true -Duser_manual=true -Dmanpage=true
+    ninja -C build
 }
 
 check() {
-  cd "$srcdir/$_pkgname"
-  ninja -C build test
+    cd "$srcdir/$_pkgname"
+    ninja -C build test
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
-  install -vDm 644 AUTHORS CONTRIBUTING.md CHANGELOG.md README.md THANKS TRANSLATORS \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
-  DESTDIR="${pkgdir}/" ninja -C build install
+    cd "$srcdir/$_pkgname"
+    install -vDm 644 AUTHORS CONTRIBUTING.md CHANGELOG.md README.md THANKS TRANSLATORS \
+        -t "${pkgdir}/usr/share/doc/${pkgname}/"
+    DESTDIR="${pkgdir}/" ninja -C build install
 }