From 45e39b7aaf9b6216afb9f63a1cd8eccb18eaad53 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sun, 8 Nov 2026 08:39:23 -0500 Subject: [PATCH] fix(desktop): catalog AppImages such as RPCS3 start from the desktop menu again (#2274) fix(desktop): catalog AppImages start from the desktop menu through the shipped runtime RPCS3 from the desktop menu exited at once: its own AppImage runtime runs dwarfsextract from a memfd, which PRoot cannot execute (EACCES), and it has no fallback. Emulator rail launches already avoid this by starting arm64 images through the shipped uruntime (#1191); the menu entries the catalog writes did not. The rule now lives in one launcher, droiddeck-appimage-exec, used by the session and by the catalog's menu entries. Entries written by older versions are moved to it with the existing menu migration. --- .../launcher/runtime/DesktopCatalog.kt | 3 +- .../droiddeck/launcher/runtime/LegacyNames.kt | 26 +++++---- .../launcher/session/SessionFiles.kt | 1 + .../launcher/runtime/LegacyNamesTest.kt | 14 +++++ .../usr/local/bin/droiddeck-appimage-exec | 16 ++++++ .../overlay/usr/local/bin/droiddeck-session | 8 +-- tools/tests/test_session_appimage.py | 56 +++++++++++++------ 7 files changed, 89 insertions(+), 35 deletions(-) create mode 100755 tools/linuxfs/overlay/usr/local/bin/droiddeck-appimage-exec diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt index 2b976796fc..835c85894d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DesktopCatalog.kt @@ -15,6 +15,7 @@ object DesktopCatalog { const val CATALOG_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/desktop.json" const val STEAM_SEED_URL = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck-Components/main/steam-seed.json" const val PROTON_SEED_ID = "proton-arm64" + const val APPIMAGE_EXEC = "/usr/local/bin/droiddeck-appimage-exec" class Entry( val id: String, val name: String, val tier: Int, val version: String, val kind: String, @@ -216,7 +217,7 @@ object DesktopCatalog { target.setExecutable(true, false) FileUtils.writeString(File(root, "usr/share/applications/droiddeck-${entry.id}.desktop"), "[Desktop Entry]\nType=Application\nName=${entry.name}\n" + - "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/${entry.id}.AppImage\n" + + "Exec=$APPIMAGE_EXEC /opt/appimages/${entry.id}.AppImage\n" + "Icon=${entry.icon}\nTerminal=false\nCategories=${entry.category};\n") } else -> { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt index eb01d3dc53..3febbfd1fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LegacyNames.kt @@ -21,9 +21,11 @@ object LegacyNames { "etc/bannerlator-network.json" to "etc/droiddeck-network.json", "etc/bannerlator-wifi-scan-request" to "etc/droiddeck-wifi-scan-request", ) - private const val MENU_DIR = "usr/local/share/applications" - private const val OLD_BIN = "/usr/local/bin/bannerlator-" - private const val NEW_BIN = "/usr/local/bin/droiddeck-" + private val MENU_REWRITES = listOf( + Triple("usr/local/share/applications", "/usr/local/bin/bannerlator-", "/usr/local/bin/droiddeck-"), + Triple("usr/share/applications", "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/", + "Exec=${DesktopCatalog.APPIMAGE_EXEC} /opt/appimages/"), + ) @JvmStatic @Synchronized @@ -95,14 +97,16 @@ object LegacyNames { } private fun rewriteMenuEntries(root: File) { - val entries = File(root, MENU_DIR).listFiles { f -> f.isFile && f.name.startsWith("droiddeck-") && f.name.endsWith(".desktop") } ?: return - for (entry in entries) { - val text = FileUtils.readString(entry) ?: continue - if (!text.contains(OLD_BIN)) continue - val staged = File(entry.parentFile, entry.name + ".staged") - if (!FileUtils.writeString(staged, text.replace(OLD_BIN, NEW_BIN)) || !staged.renameTo(entry)) { - staged.delete() - Log.w(TAG, "could not rewrite $entry") + for ((dir, old, new) in MENU_REWRITES) { + val entries = File(root, dir).listFiles { f -> f.isFile && f.name.startsWith("droiddeck-") && f.name.endsWith(".desktop") } ?: continue + for (entry in entries) { + val text = FileUtils.readString(entry) ?: continue + if (!text.contains(old)) continue + val staged = File(entry.parentFile, entry.name + ".staged") + if (!FileUtils.writeString(staged, text.replace(old, new)) || !staged.renameTo(entry)) { + staged.delete() + Log.w(TAG, "could not rewrite $entry") + } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index cb9b5391fc..1b4e78ad00 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -112,6 +112,7 @@ object SessionFiles { "usr/local/bin/droiddeck-flatpak-setup" to "usr/local/bin/droiddeck-flatpak-setup", "usr/local/bin/droiddeck-flatpak-run" to "usr/local/bin/droiddeck-flatpak-run", "usr/local/bin/droiddeck-appimage-run" to "usr/local/bin/droiddeck-appimage-run", + "usr/local/bin/droiddeck-appimage-exec" to "usr/local/bin/droiddeck-appimage-exec", "usr/local/bin/droiddeck-script-run" to "usr/local/bin/droiddeck-script-run", "usr/local/bin/droiddeck-open" to "usr/local/bin/droiddeck-open", "usr/local/bin/droiddeck-proton-run" to "usr/local/bin/droiddeck-proton-run", diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt index 82487c6a1e..a921259b16 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/LegacyNamesTest.kt @@ -79,4 +79,18 @@ class LegacyNamesTest { assertEquals("Exec=/usr/local/bin/bannerlator-steam-launch\n", File(root, "usr/local/share/applications/firefox.desktop").readText()) } + + @Test fun catalogAppImageMenusStartThroughTheSharedLauncher() { + write("usr/share/applications/droiddeck-rpcs3.desktop", + "[Desktop Entry]\nName=RPCS3\nExec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/rpcs3.AppImage\nCategories=Emulator;\n") + write("usr/share/applications/droiddeck-steam-x64.desktop", "[Desktop Entry]\nExec=droiddeck-steam-x64\n") + write("usr/share/applications/other.desktop", "Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/other.AppImage\n") + LegacyNames.migrateRootfs(root) + LegacyNames.migrateRootfs(root) + assertEquals("[Desktop Entry]\nName=RPCS3\nExec=/usr/local/bin/droiddeck-appimage-exec /opt/appimages/rpcs3.AppImage\nCategories=Emulator;\n", + File(root, "usr/share/applications/droiddeck-rpcs3.desktop").readText()) + assertEquals("[Desktop Entry]\nExec=droiddeck-steam-x64\n", File(root, "usr/share/applications/droiddeck-steam-x64.desktop").readText()) + assertEquals("Exec=env APPIMAGE_EXTRACT_AND_RUN=1 /opt/appimages/other.AppImage\n", + File(root, "usr/share/applications/other.desktop").readText()) + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-appimage-exec b/tools/linuxfs/overlay/usr/local/bin/droiddeck-appimage-exec new file mode 100755 index 0000000000..454333efa9 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-appimage-exec @@ -0,0 +1,16 @@ +#!/bin/bash +set -u +image=${1:?usage: droiddeck-appimage-exec [args...]} +shift +export APPIMAGE_EXTRACT_AND_RUN=1 +chmod +x "$image" 2>/dev/null +if [ -x /usr/local/bin/droiddeck-fex ]; then + case $(od -An -tu2 -j18 -N2 "$image" 2>/dev/null | tr -d ' ') in + 3|62) exec /usr/local/bin/droiddeck-fex run --mode on -- "$image" "$@" ;; + esac +fi +if [ -x /usr/local/lib/droiddeck/uruntime ]; then + export TARGET_APPIMAGE=$image + exec /usr/local/lib/droiddeck/uruntime "$@" +fi +exec "$image" "$@" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index c468dbf5f4..d3c559c0ab 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -642,13 +642,7 @@ case $mode in fi case ${target,,} in *.appimage) - export APPIMAGE_EXTRACT_AND_RUN=1 - chmod +x "$target" 2>/dev/null - if [ ${#fex[@]} -eq 0 ] && [ -x /usr/local/lib/droiddeck/uruntime ]; then - export TARGET_APPIMAGE=$target - run_program /usr/local/lib/droiddeck/uruntime "$@" - fi - run_program "${fex[@]}" "$target" "$@" + run_program /usr/local/bin/droiddeck-appimage-exec "$target" "$@" ;; *.sh) if [ -x /usr/local/bin/droiddeck-fex ]; then diff --git a/tools/tests/test_session_appimage.py b/tools/tests/test_session_appimage.py index f1ba2d11af..3fc5352427 100644 --- a/tools/tests/test_session_appimage.py +++ b/tools/tests/test_session_appimage.py @@ -6,8 +6,12 @@ import tempfile import unittest from pathlib import Path -SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session" +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +SESSION = BIN / "droiddeck-session" +EXEC = BIN / "droiddeck-appimage-exec" URUNTIME = "/usr/local/lib/droiddeck/uruntime" +FEX = "/usr/local/bin/droiddeck-fex" +REPORT = "#!/bin/sh\nprintf '%%s\\n' \"TARGET=${TARGET_APPIMAGE:-} EXTRACT=${APPIMAGE_EXTRACT_AND_RUN:-}\" %s \"$@\"\n" def target_case(): @@ -15,34 +19,54 @@ def target_case(): return match.group(0) -class SessionAppImageTest(unittest.TestCase): +class AppImageExecTest(unittest.TestCase): def setUp(self): self.dir = Path(tempfile.mkdtemp()) self.addCleanup(shutil.rmtree, self.dir, True) self.image = self.dir / "rpcs3.AppImage" - self.image.write_bytes(b"\x7fELF") - self.uruntime = self.dir / "uruntime" - self.uruntime.write_text("#!/bin/sh\n") - self.uruntime.chmod(0o755) + self.machine(183) + self.uruntime = self.tool("uruntime", "uruntime") + self.fex = self.tool("droiddeck-fex", "fex") - def launch(self, fex=()): - script = ("set -u\n" - "run_program() { printf '%%s\\n' \"TARGET=${TARGET_APPIMAGE:-} EXTRACT=${APPIMAGE_EXTRACT_AND_RUN:-}\" \"$@\"; exit 0; }\n" - "target=%s\nfex=(%s)\nset -- --no-gui\n" % (self.image, " ".join(fex)) - + target_case().replace(URUNTIME, str(self.uruntime))) + def machine(self, number): + self.image.write_bytes(b"\x7fELF" + bytes(14) + number.to_bytes(2, "little") + bytes(44)) + + def tool(self, name, label): + path = self.dir / name + path.write_text(REPORT % label) + path.chmod(0o755) + return path + + def launch(self): + script = self.dir / "exec" + script.write_text(EXEC.read_text().replace(URUNTIME, str(self.uruntime)).replace(FEX, str(self.fex))) env = {k: v for k, v in os.environ.items() if k not in ("TARGET_APPIMAGE", "APPIMAGE_EXTRACT_AND_RUN")} - return subprocess.run(["bash", "-c", script], env=env, capture_output=True, text=True, timeout=30).stdout.splitlines() + return subprocess.run(["bash", str(script), str(self.image), "--no-gui"], env=env, + capture_output=True, text=True, timeout=30).stdout.splitlines() def test_an_arm64_image_runs_through_the_shipped_runtime(self): - self.assertEqual(["TARGET=%s EXTRACT=1" % self.image, str(self.uruntime), "--no-gui"], self.launch()) + self.assertEqual(["TARGET=%s EXTRACT=1" % self.image, "uruntime", "--no-gui"], self.launch()) def test_without_the_shipped_runtime_the_image_runs_itself(self): self.uruntime.unlink() - self.assertEqual(["TARGET= EXTRACT=1", str(self.image), "--no-gui"], self.launch()) + self.image.write_text(REPORT % "own") + self.assertEqual(["TARGET= EXTRACT=1", "own", "--no-gui"], self.launch()) def test_an_x86_image_still_starts_under_fex(self): - fex = ("/usr/local/bin/droiddeck-fex", "run", "--mode", "on", "--") - self.assertEqual(["TARGET= EXTRACT=1", *fex, str(self.image), "--no-gui"], self.launch(fex)) + self.machine(62) + self.assertEqual(["TARGET= EXTRACT=1", "fex", "run", "--mode", "on", "--", str(self.image), "--no-gui"], self.launch()) + + def test_an_x86_image_without_fex_uses_the_shipped_runtime(self): + self.machine(62) + self.fex.unlink() + self.assertEqual(["TARGET=%s EXTRACT=1" % self.image, "uruntime", "--no-gui"], self.launch()) + + def test_the_session_starts_images_through_the_shared_launcher(self): + script = ("set -u\n" + "run_program() { printf '%%s\\n' \"$@\"; exit 0; }\n" + "target=%s\nfex=()\nset -- --no-gui\n" % self.image + target_case()) + out = subprocess.run(["bash", "-c", script], capture_output=True, text=True, timeout=30).stdout.splitlines() + self.assertEqual(["/usr/local/bin/droiddeck-appimage-exec", str(self.image), "--no-gui"], out) if __name__ == "__main__":