funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2025-12-12 23:58:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

PREVENT_LAUNCHER_FILE was missing in start_launcher, new retrofe version to record back retrofe pid after a game finishes

Browse Source
This commit is contained in:
Vincent-FK 2021-01-05 23:44:09 +01:00
parent 61b1ec3d8d
commit 9d5c1baeb8
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher
View File

@ -5,6 +5,7 @@
LOCK_FILE="/var/lock/launcher.lock" LOCK_FILE="/var/lock/launcher.lock"
INSTANT_PLAY_FILE="/mnt/instant_play" INSTANT_PLAY_FILE="/mnt/instant_play"
PREVENT_LAUNCHER_FILE="/mnt/prevent_launcher"
GMENU2X_FILE="/mnt/gmenu2x" GMENU2X_FILE="/mnt/gmenu2x"
GMENU2X_HOME="/mnt/funkey/.gmenu2x" GMENU2X_HOME="/mnt/funkey/.gmenu2x"
@ -33,27 +34,27 @@ while true; do
# Check if prevent launcher file present # Check if prevent launcher file present
if [ -f "${PREVENT_LAUNCHER_FILE}" ]; then if [ -f "${PREVENT_LAUNCHER_FILE}" ]; then
echo "${PREVENT_LAUNCHER_FILE} file found, not starting launcher" echo "${PREVENT_LAUNCHER_FILE} file found, not starting launcher"
sleep 5 sleep 5
else else
if [ -f "${GMENU2X_FILE}" ]; then if [ -f "${GMENU2X_FILE}" ]; then
# Launch gmenu2x # Launch gmenu2x
gmenu2x& gmenu2x&
else else
# Launch Retrofe # Launch Retrofe
retrofe& retrofe&
fi fi
# Record the PID into a file, wait for the # Record the PID into a file, wait for the
# process to terminate and erase the recorded PID # process to terminate and erase the recorded PID
record_pid $! record_pid $!
wait $! wait $!
erase_pid erase_pid
# In case retrofe quits with errors, clear graphic VT # In case retrofe quits with errors, clear graphic VT
termfix_all termfix_all
fi fi
done done
rm "${LOCK_FILE}" rm "${LOCK_FILE}"

2
FunKey/package/retrofe/retrofe.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
RETROFE_VERSION = 63180b9 RETROFE_VERSION = 343f64f
RETROFE_SITE_METHOD = git RETROFE_SITE_METHOD = git
RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git RETROFE_SITE = https://github.com/FunKey-Project/RetroFE.git
RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib RETROFE_DEPENDENCIES = gstreamer1 gst1-plugins-base sdl sdl_image sdl_mixer sdl_sound sdl_ttf libglib2 sqlite zlib