From 77f687a6fa6a46358a118c6d3e85dbda9546960e Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 24 Aug 2025 22:14:19 +0200
Subject: runtime data dir variable, export template godot

---
 snap/client-wrapper.sh |  4 ----
 snap/snapcraft.yaml    | 15 +++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 snap/client-wrapper.sh

diff --git a/snap/client-wrapper.sh b/snap/client-wrapper.sh
deleted file mode 100644
index 2b2119f..0000000
--- a/snap/client-wrapper.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd $SNAP/usr/share/hurrycurry
-$SNAP/bin/godot --main-pack $SNAP/usr/share/hurrycurry/client.pck
-
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index fc0a0cf..8aa9ab1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -36,13 +36,16 @@ layout:
 
 apps:
     server:
-        command: bin/hurrycurry-server --data-dir $SNAP/usr/share/hurrycurry/data
+        command: $SNAP/bin/hurrycurry-server
+        environment:
+            HURRYCURRY_DATA_PATH: $SNAP/usr/share/hurrycurry/data
         plugs:
             - network
             - network-bind
     hurrycurry:
-        extensions: [gnome]
-        command: bin/client-wrapper.sh
+        command: $SNAP/bin/godot --main-pack $SNAP/usr/share/hurrycurry/client.pck
+        environment:
+            HURRYCURRY_DATA_PATH: $SNAP/usr/share/hurrycurry/data
         plugs:
             - audio-playback
             - desktop
@@ -104,8 +107,8 @@ parts:
 
     godot:
         plugin: dump
-        source: https://github.com/godotengine/godot/releases/download/4.4.1-stable/Godot_v4.4.1-stable_linux.x86_64.zip
-        organize: { "Godot*": bin/godot }
+        source: https://github.com/godotengine/godot/releases/download/4.4.1-stable/Godot_v4.4.1-stable_export_templates.tpz
+        organize: { "templates/linux_release.x86_64": bin/godot }
         prime: [bin/godot]
 
     godot-runtime-libs:
@@ -134,7 +137,7 @@ parts:
             cp -v org.metamuffin.hurrycurry.client.desktop $CRAFT_PART_INSTALL/org.metamuffin.hurrycurry.client.desktop
         parse-info: [org.metamuffin.hurrycurry.client.metainfo.xml]
         organize:
-            { "org.metamuffin.hurrycurry.client.desktop": "meta/gui/org.metamuffin.hurrycurry.client.desktop" }
+            "org.metamuffin.hurrycurry.client.desktop": "meta/gui/org.metamuffin.hurrycurry.client.desktop"
         prime: [meta/gui/org.metamuffin.hurrycurry.client.desktop]
 
     client:
-- 
cgit v1.2.3-70-g09d2