fixups

contrib/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: jason <jason@oxen.io>
-pkgname=lokinet-git
-pkgver=git
-pkgrel=3
+pkgname=lokinet-official
+pkgver=0.9.7
+pkgrel=1
 pkgdesc="Anonymous, decentralized and IP based overlay network for the internet."
 arch=('x86_64' 'aarch64')
 url="https://lokinet.org"
@@ -9,21 +9,21 @@ license=('GPL3')
 depends=('libuv' 'libsodium' 'curl' 'unbound' 'sqlite' 'jemalloc' 'libsystemd')
 makedepends=('git' 'cmake' 'pkgconf')
 conflicts=('lokinet' 'lokinet-bin')
-source=("lokinet-git::git+https://github.com/oxen-io/lokinet#branch=stable")
+source=("lokinet-git::git+https://github.com/oxen-io/lokinet#branch=makepkg")
 b2sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/lokinet-git"
-    printf 'r%s.%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "$srcdir/$pkgname"
+    printf "v${pkgver}_%s" "$(git log -n1 --pretty='%h')"
 }
 
 prepare() {
-          cd lokinet-git
+          cd "$srcdir/$pkgname"
           git submodule update --init --recursive
 }
 
 build() {
-	cd "lokinet-git"
+	cd "$srcdir/$pkgname"
 
 	rm -rf build && mkdir build && cd build
 	cmake \
@@ -40,19 +40,19 @@ build() {
 }
 
 package() {
-	cd "lokinet-git"
+	cd "$srcdir/$pkgname"
 	install -D -m 644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	cd build
 	make DESTDIR="$pkgdir" install
 
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet.service"                "$pkgdir/usr/lib/systemd/system/lokinet.service"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet-vpn.service@"           "$pkgdir/usr/lib/systemd/system/lokinet-vpn.service@"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet-bootstrap.service"      "$pkgdir/usr/lib/systemd/system/lokinet-bootstrap.service"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet-default-config.service" "$pkgdir/usr/lib/systemd/system/lokinet-default-config.service"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet-resume.service"         "$pkgdir/usr/lib/systemd/system/lokinet-resume.service"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet.sysusers"               "$pkgdir/usr/lib/sysusers.d/lokinet.conf"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/archlinux/lokinet.tmpfiles"               "$pkgdir/usr/lib/tmpfiles.d/lokinet.conf"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/systemd-resolved/lokinet.pkla"            "$pkgdir/var/lib/polkit-1/localauthority/10-vendor.d/lokinet.pkla"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet.service"                "$pkgdir/usr/lib/systemd/system/lokinet.service"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet-vpn@.service"           "$pkgdir/usr/lib/systemd/system/lokinet-vpn@.service"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet-bootstrap.service"      "$pkgdir/usr/lib/systemd/system/lokinet-bootstrap.service"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet-default-config.service" "$pkgdir/usr/lib/systemd/system/lokinet-default-config.service"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet-resume.service"         "$pkgdir/usr/lib/systemd/system/lokinet-resume.service"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet.sysusers"               "$pkgdir/usr/lib/sysusers.d/lokinet.conf"
+	install -D -m 644 "$srcdir/$pkgname/contrib/archlinux/lokinet.tmpfiles"               "$pkgdir/usr/lib/tmpfiles.d/lokinet.conf"
+	install -D -m 644 "$srcdir/$pkgname/contrib/systemd-resolved/lokinet.pkla"            "$pkgdir/var/lib/polkit-1/localauthority/10-vendor.d/lokinet.pkla"
 	install -D -m 750 -d "$pkgdir/usr/share/polkit-1/rules.d"
-	install -D -m 644 "$srcdir/lokinet-git/contrib/systemd-resolved/lokinet.rules"           "$pkgdir/usr/share/polkit-1/rules.d/lokinet.rules"
+	install -D -m 644 "$srcdir/$pkgname/contrib/systemd-resolved/lokinet.rules"           "$pkgdir/usr/share/polkit-1/rules.d/lokinet.rules"
 }