From 9d5c1baeb8c1217a1299db30fa3de8d160f585d5 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Tue, 5 Jan 2021 23:44:09 +0100 Subject: [PATCH] PREVENT_LAUNCHER_FILE was missing in start_launcher, new retrofe version to record back retrofe pid after a game finishes --- .../usr/local/sbin/start_launcher | 33 ++++++++++--------- FunKey/package/retrofe/retrofe.mk | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher index 4be736c..c6593df 100755 --- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/start_launcher @@ -5,6 +5,7 @@ LOCK_FILE="/var/lock/launcher.lock" INSTANT_PLAY_FILE="/mnt/instant_play" +PREVENT_LAUNCHER_FILE="/mnt/prevent_launcher" GMENU2X_FILE="/mnt/gmenu2x" GMENU2X_HOME="/mnt/funkey/.gmenu2x" @@ -33,27 +34,27 @@ while true; do # Check if prevent launcher file present if [ -f "${PREVENT_LAUNCHER_FILE}" ]; then - echo "${PREVENT_LAUNCHER_FILE} file found, not starting launcher" - sleep 5 + echo "${PREVENT_LAUNCHER_FILE} file found, not starting launcher" + sleep 5 else - if [ -f "${GMENU2X_FILE}" ]; then + if [ -f "${GMENU2X_FILE}" ]; then - # Launch gmenu2x - gmenu2x& - else + # Launch gmenu2x + gmenu2x& + else - # Launch Retrofe - retrofe& - fi + # Launch Retrofe + retrofe& + fi - # Record the PID into a file, wait for the - # process to terminate and erase the recorded PID - record_pid $! - wait $! - erase_pid + # Record the PID into a file, wait for the + # process to terminate and erase the recorded PID + record_pid $! + wait $! + erase_pid - # In case retrofe quits with errors, clear graphic VT - termfix_all + # In case retrofe quits with errors, clear graphic VT + termfix_all fi done rm "${LOCK_FILE}" diff --git a/FunKey/package/retrofe/retrofe.mk b/FunKey/package/retrofe/retrofe.mk index d176f26..da153de 100644 --- a/FunKey/package/retrofe/retrofe.mk +++ b/FunKey/package/retrofe/retrofe.mk @@ -4,7 +4,7 @@ # ################################################################################ -RETROFE_VERSION = 63180b9 +RETROFE_VERSION = 343f64f RETROFE_SITE_METHOD = 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