Included downloaded bios files in flatpak

Removed network access check where no longer needed
Corrected config file target for Cemu reset

automation_tools/automation_task_list.cfg

@@ -4,5 +4,8 @@ hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%
 hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip
 hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
 hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip
+hash^PPSSPPBIOSHASHPLACEHOLDER^https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip
+hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip
+hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip
 latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
 outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid

functions/prepare_emulator.sh

@@ -59,7 +59,6 @@ prepare_emulator() {
 
   if [[ "$emulator" =~ ^(retroarch|RetroArch|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
-      if [[ $(check_network_connectivity) == "true" ]]; then
       if [[ $multi_user_mode == "true" ]]; then
         rm -rf "$multi_user_data_folder/$SteamAppUser/config/retroarch"
         mkdir -p "$multi_user_data_folder/$SteamAppUser/config/retroarch"
@@ -94,12 +93,7 @@ prepare_emulator() {
       then
         mv -fv $bios_folder/PPSSPP/flash0/font $bios_folder/PPSSPP/flash0/font.bak
       fi
-        mkdir -p $bios_folder/PPSSPP
+      cp -rf "/app/retrodeck/extras/PPSSPP" "$bios_folder/PPSSPP"
-        wget "https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip" -P $bios_folder/PPSSPP
-        unzip -q "$bios_folder/PPSSPP/master.zip" -d $bios_folder/PPSSPP/
-        mv -f "$bios_folder/PPSSPP/ppsspp-master/assets/"* "$bios_folder/PPSSPP/"
-        rm -rfv "$bios_folder/PPSSPP/master.zip"
-        rm -rfv "$bios_folder/PPSSPP/ppsspp-master"
       if [ -d $bios_folder/PPSSPP/flash0/font.bak ]
       then
         mv -f $bios_folder/PPSSPP/flash0/font.bak $bios_folder/PPSSPP/flash0/font
@@ -109,16 +103,8 @@ prepare_emulator() {
       echo "-----------------------------------------------------------"
       echo "Initializing MSX / SVI / ColecoVision / SG-1000 LIBRETRO"
       echo "-----------------------------------------------------------"
-        wget "http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip" -P $bios_folder/MSX
+      cp -rf "/app/retrodeck/extras/MSX/Databases" "$bios_folder/Databases"
-        unzip -q "$bios_folder/MSX/blueMSXv282full.zip" -d $bios_folder/MSX
+      cp -rf "/app/retrodeck/extras/MSX/Machines" "$bios_folder/Machines"
-        mv -f $bios_folder/MSX/Databases $bios_folder/Databases
-        mv -f $bios_folder/MSX/Machines $bios_folder/Machines
-        rm -rf $bios_folder/MSX
-      else
-        if [[ "$call_source" == "cli" ]]; then
-          printf "You do not appear to be connected to a network with internet access.\n\nThe RetroArch reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available.\n"
-        fi
-      fi
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       dir_prep "$bios_folder" "/var/config/retroarch/system"
@@ -147,8 +133,8 @@ prepare_emulator() {
         rm -rf /var/config/Cemu
         mkdir -pv /var/config/Cemu/
         cp -fr "$emuconfigs/cemu/"* /var/config/Cemu/
-        set_setting_value "$multi_user_data_folder/$SteamAppUser/config/Cemu/settings.ini" "mlc_path" "$bios_folder/cemu" "cemu"
+        set_setting_value "$cemuconf" "mlc_path" "$bios_folder/cemu" "cemu"
-        set_setting_value "$multi_user_data_folder/$SteamAppUser/config/Cemu/settings.ini" "Entry" "$roms_folder/wiiu" "cemu" "GamePaths"
+        set_setting_value "$cemuconf" "Entry" "$roms_folder/wiiu" "cemu" "GamePaths"
       fi
       # Shared actions
       dir_prep "$saves_folder/wiiu/cemu" "$bios_folder/cemu/usr/save"
@@ -514,7 +500,6 @@ prepare_emulator() {
 
   if [[ "$emulator" =~ ^(xemu|XEMU|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
-      if [[ $(check_network_connectivity) == "true" ]]; then
       echo "------------------------"
       echo "Initializing XEMU"
       echo "------------------------"
@@ -546,14 +531,7 @@ prepare_emulator() {
       # Preparing HD dummy Image if the image is not found
       if [ ! -f $bios_folder/xbox_hdd.qcow2 ]
       then
-          wget "https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip" -P $bios_folder/
+        cp -f "/app/retrodeck/extras/XEMU/xbox_hdd.qcow2" "$bios_folder/xbox_hdd.qcow2"
-          unzip -q $bios_folder/xbox_hdd.qcow2.zip -d $bios_folder/
-          rm -rfv $bios_folder/xbox_hdd.qcow2.zip
-        fi
-      else
-        if [[ "$call_source" == "cli" ]]; then
-          printf "You do not appear to be connected to a network with internet access.\n\nThe Xemu reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available.\n"
-        fi
       fi
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands

net.retrodeck.retrodeck.yml

@@ -463,6 +463,27 @@ modules:
         url: https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip
         sha256: SAMEDUCKSHAPLACEHOLDER
 
+  - name: ppsspp-bios
+    buildsystem: simple
+    build-commands:
+    - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/PPSSPP
+    - mv -f "ppsspp-master/assets/"* "${FLATPAK_DEST}/retrodeck/extras/PPSSPP/"
+    sources:
+      - type: archive
+        url: https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip
+        sha256: PPSSPPBIOSHASHPLACEHOLDER
+
+  - name: msx-bios
+    buildsystem: simple
+    build-commands:
+    - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/MSX
+    - mv -f Databases ${FLATPAK_DEST}/retrodeck/extras/MSX/Databases
+    - mv -f Machines ${FLATPAK_DEST}/retrodeck/extras/MSX/Machines
+    sources:
+      - type: archive
+        url: http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip
+        sha256: MSXBIOSHASHPLACEHOLDER
+  
   - name: doom-shareware
     buildsystem: simple
     build-commands:
@@ -790,6 +811,16 @@ modules:
           timestamp-query: .published_at
           version-query: .tag_name
 
+  - name: xemu-dummy-hdd
+    buildsystem: simple
+    build-commands:
+    - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/XEMU
+    - mv -f "xbox_hdd.qcow2" "${FLATPAK_DEST}/retrodeck/extras/XEMU/xbox_hdd.qcow2"
+    sources:
+      - type: archive
+        url: https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip
+        sha256: XEMUHDDHASHPLACEHOLDER
+
   # XEMU - END
 
   # MELONDS - START

retrodeck.sh

@@ -140,12 +140,7 @@ if [ -f "$lockfile" ]; then
 # if the lock file doesn't exist at all means that it's a fresh install or a triggered reset
 else
   echo "Lockfile not found"
-  if [[ $(check_network_connectivity) == "true" ]]; then
   finit             # Executing First/Force init
-  else
-    configurator_generic_dialog "RetroDECK Setup" "You do not appear to be connected to a network with internet access.\n\nThe initial RetroDECK setup requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
-    exit 1
-  fi
 fi
 
 if [[ $multi_user_mode == "true" ]]; then

tools/configurator.sh

@@ -943,13 +943,8 @@ configurator_reset_dialog() {
 
     "RetroArch" | "XEMU" ) # Emulators that require network access
       if [[ $(configurator_reset_confirmation_dialog "$emulator_to_reset" "Are you sure you want to reset the $emulator_to_reset emulator to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
-        if [[ $(check_network_connectivity) == "true" ]]; then
         prepare_emulator "reset" "$emulator_to_reset" "configurator"
         configurator_process_complete_dialog "resetting $emulator_to_reset"
-        else
-          configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "You do not appear to be connected to a network with internet access.\n\nThe $emulator_to_reset reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
-          configurator_reset_dialog
-        fi
       else
         configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled."
         configurator_reset_dialog
@@ -975,7 +970,6 @@ configurator_reset_dialog() {
 
 "Reset All Emulators" )
   if [[ $(configurator_reset_confirmation_dialog "all emulators" "Are you sure you want to reset all emulators to default settings?\n\nThis process cannot be undone.") == "true" ]]; then
-    if [[ $(check_network_connectivity) == "true" ]]; then
     (
     prepare_emulator "reset" "all"
     ) |
@@ -984,10 +978,6 @@ configurator_reset_dialog() {
     --title "RetroDECK Finishing Initialization" \
     --text="RetroDECK is finishing the reset process, please wait."
     configurator_process_complete_dialog "resetting all emulators"
-    else
-      configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "You do not appear to be connected to a network with internet access.\n\nThe all-emulator reset process requires some files from the internet to function properly.\n\nPlease retry this process once a network connection is available."
-      configurator_reset_dialog
-    fi
   else
     configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled."
     configurator_reset_dialog