From 1f8d946de4c5f3d627d2ffa9782c95883a955ccc Mon Sep 17 00:00:00 2001 From: Dexter Reed Date: Sat, 21 Sep 2024 00:11:52 +0100 Subject: [PATCH] Install ClassiCube texpack and audio in Flatpak by default --- misc/flatpak/ClassiCubeLauncher | 8 +++++-- .../net.classicube.flatpak.client.SDL3.json | 22 +++++++++++++++++++ .../net.classicube.flatpak.client.X11.json | 22 +++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/misc/flatpak/ClassiCubeLauncher b/misc/flatpak/ClassiCubeLauncher index 104e37ac2..2d65f041f 100644 --- a/misc/flatpak/ClassiCubeLauncher +++ b/misc/flatpak/ClassiCubeLauncher @@ -1,3 +1,7 @@ #!/bin/sh -mkdir -p ${XDG_DATA_HOME}/ClassiCube -cd ${XDG_DATA_HOME}/ClassiCube && exec ClassiCube $@ \ No newline at end of file +# Fallback Texture Pack and Audio +mkdir -p ${XDG_DATA_HOME}/ClassiCube/texpacks ${XDG_DATA_HOME}/ClassiCube/audio +test -f ${XDG_DATA_HOME}/ClassiCube/texpacks/classicube.zip || cp /app/share/classicube-texpack.zip ${XDG_DATA_HOME}/ClassiCube/texpacks/classicube.zip +test -f ${XDG_DATA_HOME}/ClassiCube/audio/classicube.zip || cp /app/share/classicube-audio.zip ${XDG_DATA_HOME}/ClassiCube/audio/classicube.zip + +cd ${XDG_DATA_HOME}/ClassiCube && exec ClassiCube "$@" diff --git a/misc/flatpak/net.classicube.flatpak.client.SDL3.json b/misc/flatpak/net.classicube.flatpak.client.SDL3.json index 81145db1f..1c23bb0d9 100644 --- a/misc/flatpak/net.classicube.flatpak.client.SDL3.json +++ b/misc/flatpak/net.classicube.flatpak.client.SDL3.json @@ -56,6 +56,28 @@ } ] }, + { + "name": "ClassiCubeAssets", + "buildsystem": "simple", + "build-commands": [ + "install -Dm644 classicube-texpack.zip ${FLATPAK_DEST}/share/classicube-texpack.zip", + "install -Dm644 classicube-audio.zip ${FLATPAK_DEST}/share/classicube-audio.zip" + ], + "sources": [ + { + "type": "file", + "dest-filename": "classicube-texpack.zip", + "url": "https://classicube.net/static/default.zip", + "sha256": "55eac12a9727d209b42694d07dfdca8d50349779ab77ffc11a31d2cb66b45635" + }, + { + "type": "file", + "dest-filename": "classicube-audio.zip", + "url": "https://classicube.net/static/audio.zip", + "sha256": "13562a712d1cb1de3f36dd93a03245a377f201e7934d19c17de09202b410e04b" + } + ] + }, { "name": "ClassiCube", "buildsystem": "simple", diff --git a/misc/flatpak/net.classicube.flatpak.client.X11.json b/misc/flatpak/net.classicube.flatpak.client.X11.json index abe2f0430..23f4a1101 100644 --- a/misc/flatpak/net.classicube.flatpak.client.X11.json +++ b/misc/flatpak/net.classicube.flatpak.client.X11.json @@ -12,6 +12,28 @@ "--socket=pulseaudio" ], "modules": [ + { + "name": "ClassiCubeAssets", + "buildsystem": "simple", + "build-commands": [ + "install -Dm644 classicube-texpack.zip ${FLATPAK_DEST}/share/classicube-texpack.zip", + "install -Dm644 classicube-audio.zip ${FLATPAK_DEST}/share/classicube-audio.zip" + ], + "sources": [ + { + "type": "file", + "dest-filename": "classicube-texpack.zip", + "url": "https://classicube.net/static/default.zip", + "sha256": "55eac12a9727d209b42694d07dfdca8d50349779ab77ffc11a31d2cb66b45635" + }, + { + "type": "file", + "dest-filename": "classicube-audio.zip", + "url": "https://classicube.net/static/audio.zip", + "sha256": "13562a712d1cb1de3f36dd93a03245a377f201e7934d19c17de09202b410e04b" + } + ] + }, { "name": "ClassiCube", "buildsystem": "simple",