Fix scummvm, fix system upgrades.

packages/games/emulators/scummvmsa/sources/start_scummvm.sh

@@ -9,9 +9,16 @@
 CONFIG_DIR="/storage/.config/scummvm"
 ROMSPATH="/storage/roms"
 BIOSPATH="${ROMSPATH}/bios"
-GAME=$2
 RATMPCONF="/storage/.config/retroarch/retroarch.cfg"
 
+shopt -s extglob
+if [[ "$1" =~ ?(add|create|libretro) ]]
+then
+  GAME="$2"
+else
+  GAME="$1"
+fi
+
 if [ ! -d "${CONFIG_DIR}/games" ]
 then
   mkdir -p "${CONFIG_DIR}/games"
@@ -55,9 +62,7 @@ case $1 in
   ;;
 
   *)
-    set_audio "fluidsynth"
     GAME=$(cat "${GAME}")
-    eval /usr/bin/scummvm --fullscreen --joystick=0 --themepath=/usr/config/scummvm/themes ${GAME}
-    set_audio "pulseaudio"
+    eval /usr/bin/scummvm --fullscreen --joystick=0 --themepath=/usr/config/scummvm/themes "${GAME}"
   ;;
 esac

packages/jelos/sources/autostart/autostart

@@ -39,7 +39,6 @@ fi
 normperf 2>&1 >>${BOOTLOG}
 
 clear >/dev/console 2>&1 >>${BOOTLOG}
-/usr/bin/show_splash intro 2>&1 >>${BOOTLOG}
 
 ### Lock is a prerequisite for emustation
 rm /var/lock/start.games 2>&1 >>${BOOTLOG}

packages/jelos/sources/autostart/common/004-upgrade

@@ -15,3 +15,6 @@ then
   rm /storage/.config/boot.hint
   touch /storage/.configured
 fi
+
+clear >/dev/console
+/usr/bin/show_splash intro 2>&1 >>${BOOTLOG}

packages/jelos/sources/scripts/system-upgrade

@@ -9,6 +9,7 @@ PROJECT="JustEnoughLinuxOS/distribution"
 GIT_REPO="https://github.com/${PROJECT}"
 GIT_API="https://api.github.com/repos/${PROJECT}"
 UPDATE_PATH="/storage/.update"
+EXTENSION="img"
 
 function check_network() {
   GW=$(ip route | awk '/eth0/ {a=$0} END{print $1}')
@@ -70,15 +71,6 @@ then
   exit 0
 fi
 
-# Continue to use the .tar extension until this update
-# and then cut over to the new format for all updates.
-if [ "${LATEST_RELEASE_TAG}" -lt "20220401" ]
-then
-  EXTENSION="tar"
-else
-  EXTENSION="img"
-fi
-
 echo -e "\nFetching: ${OS_NAME}-${HW_DEVICE}.${HW_ARCH}-${LATEST_RELEASE_TAG}.${EXTENSION}" >/dev/console
 curl -Lo "${UPDATE_PATH}/${OS_NAME}-${HW_DEVICE}.${HW_ARCH}-${LATEST_RELEASE_TAG}.${EXTENSION}" "${GIT_REPO}/releases/download/${LATEST_RELEASE_TAG}/${OS_NAME}-${HW_DEVICE}.${HW_ARCH}-${LATEST_RELEASE_TAG}.tar" 2>/dev/console
 echo -e "Fetching: ${OS_NAME}-${HW_DEVICE}.${HW_ARCH}-${LATEST_RELEASE_TAG}.${EXTENSION}.sha256" >/dev/console