Fixed "pkgname", "pkgver"

2 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b7b6ffbd195..53c8d5012c6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = archtorify-git
 	pkgdesc = Transparent proxy through Tor for Arch Linux
-	pkgver = 1.19.3
+	pkgver = v1.19.4.r2.gf1f3854
 	pkgrel = 1
 	url = https://github.com/brainfucksec/archtorify/
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 784f9f04ad4b..c88444da6078 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
-# Maintainer: Brainfuck
-# https://github.com/brainfucksec
+# Maintainer: Brainfuck <brainfucksec@protonmail.com>
 
-_gitname=archtorify
 pkgname=archtorify-git
-pkgver=1.19.3
+_pkgname=archtorify
+pkgver=v1.19.4.r2.gf1f3854
 pkgrel=1
 pkgdesc="Transparent proxy through Tor for Arch Linux"
 arch=('any')
@@ -11,17 +10,24 @@ url="https://github.com/brainfucksec/archtorify/"
 license=('GPL3')
 depends=('tor')
 makedepends=('git')
-source=("git+https://github.com/brainfucksec/${_gitname}/")
+source=("git+https://github.com/brainfucksec/${_pkgname}/")
 md5sums=('SKIP')
 
+pkgver() {
+  cd "$_pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 package() {
-	cd "$_gitname"
+	cd "$_pkgname"
 
-	install -Dm644 README.md $pkgdir/usr/share/doc/$_gitname/README.md
+	install -Dm644 README.md $pkgdir/usr/share/doc/$_pkgname/README.md
 	install -Dm755 archtorify.sh $pkgdir/usr/bin/archtorify
-    mkdir -p $pkgdir/usr/share/$_gitname/data
-    mkdir -p $pkgdir/usr/share/$_gitname/backups
-    install -Dm644 data/* $pkgdir/usr/share/$_gitname/data
+
+    mkdir -p $pkgdir/usr/share/$_pkgname/data
+    mkdir -p $pkgdir/usr/share/$_pkgname/backups
+
+    install -Dm644 data/* $pkgdir/usr/share/$_pkgname/data
 }
 
 # vim:set ts=2 sw=2