mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
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.
This commit is contained in:
1 parent
bc99cacd02
commit
45e39b7aaf
7 files changed
+89
-35
No files matched your search
@@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
set -u
|
||||
image=${1:?usage: droiddeck-appimage-exec <AppImage> [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" "$@"
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user