works with server

2 files changed, 61 insertions, 53 deletions

diff --git a/snap/client-wrapper.sh b/snap/client-wrapper.sh
new file mode 100644
index 0000000..0170342
--- /dev/null
+++ b/snap/client-wrapper.sh
@@ -0,0 +1,3 @@
+#!/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 dcafd13..5e5bf7b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,9 +20,6 @@ layout:
         bind: $SNAP/usr/share/libdrm
 
 apps:
-    bash:
-        command: bin/bash
-
     server:
         command: bin/hurrycurry-server --data-dir $SNAP/usr/share/hurrycurry/data
         plugs:
@@ -30,7 +27,7 @@ apps:
             - network-bind
     hurrycurry:
         extensions: [gnome]
-        command: bin/godot --main-pack $SNAP/usr/share/hurrycurry/client.pck
+        command: bin/client-wrapper.sh
         plugs:
             - audio-playback
             - desktop
@@ -44,60 +41,58 @@ apps:
             - x11
 
 parts:
-    bash:
-        plugin: nil
-        override-build: |
-            cp /usr/bin/bash $CRAFT_PART_INSTALL/bash
-        organize: { bash: bin/bash }
-        prime: [bin/bash]
+    # godot-build-profile:
+    #     plugin: dump
+    #     source: .
+    #     source-type: local
+    #     organize: { "snap/godot_profile.py": godot_profile.py }
+
+    # godot:
+    #     plugin: nil
+    #     after: [godot-build-profile]
+    #     source: https://github.com/godotengine/godot/releases/download/4.3-stable/godot-4.3-stable.tar.xz
+    #     build-packages:
+    #         - build-essential
+    #         - libasound2-dev
+    #         # - libfreetype-dev
+    #         - libgl1-mesa-dev
+    #         - libglu1-mesa-dev
+    #         # - libharfbuzz-dev
+    #         # - libogg-dev
+    #         - libpulse-dev
+    #         # - libtheora-dev
+    #         - libudev-dev
+    #         # - libvorbis-dev
+    #         # - libvpx-dev
+    #         # - libwebp-dev
+    #         - libx11-dev
+    #         - libxcursor-dev
+    #         - libxi-dev
+    #         - libxinerama-dev
+    #         - libxrandr-dev
+    #         # - libgraphite2-dev
+    #         # - zlib1g-dev
+    #         - pkg-config
+    #         - scons
+    #     override-build: |
+    #         scons profile=$CRAFT_STAGE/godot_profile.py target=editor
+    #         scons profile=$CRAFT_STAGE/godot_profile.py target=template_release
+    #     organize:
+    #         "bin/godot.linuxbsd.template_release.*": bin/godot
+    #         "bin/godot.linuxbsd.editor.*": bin/godot-editor
+    #     prime: [bin/godot]
 
-    godot-build-profile:
+    godot-editor:
         plugin: dump
-        source: .
-        source-type: local
-        organize: { "snap/godot_profile.py": godot_profile.py }
+        source: https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip
+        organize: { "Godot_*": bin/godot-editor }
 
     godot:
-        plugin: nil
-        after: [godot-build-profile]
-        source: https://github.com/godotengine/godot/releases/download/4.3-stable/godot-4.3-stable.tar.xz
-        build-packages:
-            - build-essential
-            - libasound2-dev
-            # - libfreetype-dev
-            - libgl1-mesa-dev
-            - libglu1-mesa-dev
-            # - libharfbuzz-dev
-            # - libogg-dev
-            - libpulse-dev
-            # - libtheora-dev
-            - libudev-dev
-            # - libvorbis-dev
-            # - libvpx-dev
-            # - libwebp-dev
-            - libx11-dev
-            - libxcursor-dev
-            - libxi-dev
-            - libxinerama-dev
-            - libxrandr-dev
-            # - libgraphite2-dev
-            # - zlib1g-dev
-            - pkg-config
-            - scons
-        override-build: |
-            scons profile=$CRAFT_STAGE/godot_profile.py target=editor
-            scons profile=$CRAFT_STAGE/godot_profile.py target=template_release
-        organize:
-            "bin/godot.linuxbsd.template_release.*": bin/godot
-            "bin/godot.linuxbsd.editor.*": bin/godot-editor
+        plugin: dump
+        source: https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip
+        organize: { "Godot*": bin/godot }
         prime: [bin/godot]
 
-    # godot-editor:
-    #     plugin: dump
-    #     source: https://github.com/godotengine/godot/releases/download/4.3-stable/Godot_v4.3-stable_linux.x86_64.zip
-    #     organize: { "Godot_*": bin/godot }
-    #     stage: [bin/godot]
-
     godot-runtime-libs:
         plugin: nil
         stage-packages:
@@ -125,7 +120,7 @@ parts:
 
     client:
         plugin: nil
-        after: [godot]
+        after: [godot-editor]
         source: https://codeberg.org/hurrycurry/hurrycurry.git
         stage-packages:
             - libglu1-mesa
@@ -136,6 +131,16 @@ parts:
         organize: { "client.pck": usr/share/hurrycurry/client.pck }
         prime: [usr/share/hurrycurry/client.pck]
 
+    client-wrapper:
+        plugin: dump
+        source: .
+        source-type: local
+        override-build: |
+            mkdir -p $CRAFT_PART_INSTALL/bin
+            install -m755 snap/client-wrapper.sh $CRAFT_PART_INSTALL/bin
+        stage: [bin/client-wrapper.sh]
+        prime: [bin/client-wrapper.sh]
+
     server:
         plugin: rust
         source: https://codeberg.org/hurrycurry/hurrycurry.git