Fixed git package

2 files changed, 17 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 323a77bd0aa0..0668308f71e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = gemcert
+pkgbase = gemcert-git
 	pkgdesc = A simple tool for creating self-signed certs for use in Geminispace.
-	pkgver = 0
+	pkgver = r15.fc14deb
 	pkgrel = 1
 	url = https://tildegit.org/solderpunk/gemcert
 	arch = i686
@@ -12,8 +12,9 @@ pkgbase = gemcert
 	arch = aarch64
 	license = BSD
 	makedepends = go
+	makedepends = git
 	source = gemcert::git+https://tildegit.org/solderpunk/gemcert.git
 	sha256sums = SKIP
 
-pkgname = gemcert
+pkgname = gemcert-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 89d45839057e..b6cf266c0c95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,28 @@
 # Maintainer: Ben Golberg <ben@benaaron.dev>
 
-pkgname=gemcert
-pkgver=0
+pkgname=gemcert-git
+pkgver=r15.fc14deb
 pkgrel=1
 pkgdesc="A simple tool for creating self-signed certs for use in Geminispace."
 arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-makedepends=('go')
+makedepends=('go' 'git')
 url="https://tildegit.org/solderpunk/gemcert"
 license=('BSD')
 source=("gemcert::git+https://tildegit.org/solderpunk/gemcert.git")
 sha256sums=('SKIP')
 
+pkgver() {
+  cd "$srcdir/gemcert"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
 prepare() {
-	cd gemcert
+  cd "$srcdir/gemcert"
 	mkdir -p build/
 }
 
 build() {
-  cd gemcert
+  cd "$srcdir/gemcert"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
@@ -27,11 +32,11 @@ build() {
 }
 
 check() {
-  cd gemcert
+  cd "$srcdir/gemcert"
   go test ./...
 }
 
 package() {
-  cd gemcert
-  install -Dm755 build/$pkgname "$pkgdir"/usr/bin/$pkgname
+  cd "$srcdir/gemcert"
+  install -Dm755 build/gemcert "$pkgdir"/usr/bin/gemcert
 }