Fix build, use system wide templates

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99164de105f6..7ec6da8d839e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = oh-my-git-git
 	pkgdesc = An interactive Git learning game!
-	pkgver = r465.929c634
-	pkgrel = 2
+	pkgver = 0.6.4.r21.gce9fcda
+	pkgrel = 1
 	url = https://ohmygit.org/
 	arch = x86_64
 	license = custom
-	makedepends = godot
+	makedepends = godot3
+	makedepends = godot3-export-templates
 	makedepends = zip
 	source = oh-my-git-git::git+https://github.com/git-learning-game/oh-my-git.git
-	source = https://downloads.tuxfamily.org/godotengine/3.4.1/Godot_v3.4.1-stable_export_templates.tpz
 	source = oh-my-git
 	source = oh-my-git.desktop
 	source = icon.png
 	sha512sums = SKIP
-	sha512sums = SKIP
 	sha512sums = 617b41e7fc2f05c6cb5c06ef3f0ef134d52bb40d8461b6b0013acf0d0903a96aa3f614da593d3a06072162caadd233e327aa7006b67b69da647cec6eb8fa653f
 	sha512sums = 7bfc8766cc46c1a2c8ffa63e1d6613763d91f38a53c6ef31ff3943305880507796e4704fdfea814f7af54f43040011291f6dd7f954bbe67adac95562df7a69f0
 	sha512sums = 12816c20c190222f3a70937a3721184a94fc4ea9a36e55fe4873f06a0b4e8205b34f7927b880a5968588db228051ab87a5168abddf882303a70c9b61fdb39e08
diff --git a/PKGBUILD b/PKGBUILD
index 6a1d9c6e05f0..c3ea0ae1444e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Anthony Wang <ta180m@pm.me>
+# Maintainer: Mikhail f. Shiryaev <mr dot felixoid at gmail dot com>
 pkgname=oh-my-git-git
-pkgver=r465.929c634
-pkgrel=2
+pkgver=0.6.4.r21.gce9fcda
+pkgrel=1
 pkgdesc='An interactive Git learning game!'
 arch=(x86_64)
 url='https://ohmygit.org/'
 license=(custom)
-makedepends=(godot zip)
-godotver=$(godot --version | cut -d'.' -f1-3)
+makedepends=(godot3 godot3-export-templates zip)
 source=("${pkgname}::git+https://github.com/git-learning-game/oh-my-git.git"
-        "https://downloads.tuxfamily.org/godotengine/${godotver}/Godot_v${godotver}-stable_export_templates.tpz"
         oh-my-git
         oh-my-git.desktop
         icon.png)
 sha512sums=('SKIP'
-            'SKIP'
             '617b41e7fc2f05c6cb5c06ef3f0ef134d52bb40d8461b6b0013acf0d0903a96aa3f614da593d3a06072162caadd233e327aa7006b67b69da647cec6eb8fa653f'
             '7bfc8766cc46c1a2c8ffa63e1d6613763d91f38a53c6ef31ff3943305880507796e4704fdfea814f7af54f43040011291f6dd7f954bbe67adac95562df7a69f0'
             '12816c20c190222f3a70937a3721184a94fc4ea9a36e55fe4873f06a0b4e8205b34f7927b880a5968588db228051ab87a5168abddf882303a70c9b61fdb39e08')
@@ -22,19 +20,19 @@ sha512sums=('SKIP'
 pkgver() {
   cd "${srcdir}/${pkgname}"
 
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  (
+    set -o pipefail
+    git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 
 build() {
-  cd templates
-
-  mkdir -p $HOME/.local/share/godot/templates/${godotver}.stable
-  cp linux_x11_64* $HOME/.local/share/godot/templates/${godotver}.stable
-
-  cd ../"${pkgname}"
-
-  make linux
+  cd "${srcdir}/${pkgname}"
+  sed -i 's/\bgodot\b/godot3/g' Makefile
+  ln -sf --no-dereference /usr ../.local
+  HOME="${srcdir}" make linux
 }
 
 package() {