From da2dbd0389b7f5f561e481cfe7a9defb680b8e32 Mon Sep 17 00:00:00 2001
From: Robin Boers <robindev2019@outlook.com>
Date: Tue, 27 Jul 2021 10:24:19 +0200
Subject: [PATCH] Updates to PKGBUILDs with version stuff

---
 pkg/cutie-tanks-git/PKGBUILD | 12 +++++++++---
 pkg/cutie-tanks/PKGBUILD     | 11 +++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkg/cutie-tanks-git/PKGBUILD b/pkg/cutie-tanks-git/PKGBUILD
index 338e55c..6f70eec 100644
--- a/pkg/cutie-tanks-git/PKGBUILD
+++ b/pkg/cutie-tanks-git/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Robin Boers <robindev2019@outlook.com>
-pkgname=cutie-tanks
-pkgver=1.4.4
+pkgname=cutie-tanks-git
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Shoot 'em all arcade game (development version)"
 arch=(x86_64)
@@ -11,12 +11,18 @@ makedepends=(git npm)
 checkdepends=()
 optdepends=()
 provides=(cutie-tanks)
+conflicts=(cutie-tanks)
 source=('git+https://github.com/RobinBoers/cutie-tanks'
 		'sh' 
 		'cutie-tanks.desktop'
 		'icon.png')
 md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
 
+pkgver() {
+  cd cutie-tanks
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
 	cd cutie-tanks
 	npm install
@@ -25,7 +31,7 @@ build() {
 
 package() {
 	chmod +x "sh"
-	mkdir -p "$pkgdir/opt/$pkgname/"
+	mkdir -p "$pkgdir/opt/cutie-tanks/"
 	mkdir -p "$pkgdir/usr/share/applications/"
 	mkdir -p "$pkgdir/usr/bin/"
 	
diff --git a/pkg/cutie-tanks/PKGBUILD b/pkg/cutie-tanks/PKGBUILD
index 1128f5d..1d8f1ce 100644
--- a/pkg/cutie-tanks/PKGBUILD
+++ b/pkg/cutie-tanks/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Robin Boers <robindev2019@outlook.com>
 pkgname=cutie-tanks
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=1
 pkgdesc="Shoot 'em all arcade game"
 arch=(x86_64)
@@ -11,13 +11,20 @@ makedepends=(git)
 checkdepends=()
 optdepends=()
 provides=(cutie-tanks)
-source=('https://github.com/RobinBoers/cutie-tanks/releases/latest/download/release.zip'
+conflicts=(cutie-tanks-git)
+source=('git+https://github.com/RobinBoers/cutie-tanks'
+		'https://github.com/RobinBoers/cutie-tanks/releases/latest/download/release.zip'
 		'sh' 
 		'cutie-tanks.desktop'
 		'icon.png')
 noextract=("release.zip")
 md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
 
+pkgver() {
+  cd cutie-tanks
+  git describe --abbrev=0 --tags | sed 's/^v//;'
+}
+
 build() {
 	mkdir -p cutie-tanks
   	bsdtar -xf release.zip -C cutie-tanks