Merge branch 'cooker-0.8.0b' into feat/ponzu

emu-configs/retroarch/scummvm.ini

@@ -0,0 +1,30 @@
+[scummvm]
+libretro_hooks_clear=false
+iconspath=
+mute=false
+speech_volume=192
+native_mt32=false
+mt32_device=null
+libretro_playlist_version=0
+savepath=
+confirm_exit=false
+gui_use_game_language=false
+extrapath=
+gui_scale=100
+gui_return_to_launcher_at_exit=false
+gui_disable_fixed_font_scaling=false
+fullscreen=true
+gui_browser_show_hidden=false
+browser_lastpath=
+libretro_playlist_path=/var/config/retroarch/playlists
+themepath=
+sfx_volume=192
+music_volume=192
+autosave_period=300
+gm_device=auto
+music_driver=auto
+opl_driver=auto
+speech_mute=false
+gui_language=en
+libretro_hooks_location=0
+

functions/global.sh

@@ -68,6 +68,7 @@ es_settings="/var/config/ES-DE/settings/es_settings.xml"
 
 raconf="/var/config/retroarch/retroarch.cfg"
 ra_core_conf="/var/config/retroarch/retroarch-core-options.cfg"
+ra_scummvm_conf="/var/config/retroarch/system/scummvm.ini"
 
 # CEMU config files
 

functions/patching.sh

@@ -12,7 +12,7 @@ set_setting_value() {
 
   case $4 in
 
-    "retrodeck" | "melonds" )
+    "retrodeck" | "melonds" | "libretro_scummvm" )
       if [[ -z $current_section_name ]]; then
         sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' "$1"
       else

functions/post_update.sh

@@ -275,6 +275,9 @@ post_update() {
     log i "Switch firmware folder should be moved in \"$bios_folder/switch/firmware\" from \"$bios_folder/switch/registered\""
     dir_prep "$bios_folder/switch/firmware" "$bios_folder/switch/registered"
 
+    log i "New systems were added in this version, regenerating system folders."
+    es-de --home "/var/config/" --create-system-dirs
+
   fi
 
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then

functions/prepare_component.sh

@@ -88,6 +88,18 @@ prepare_component() {
         set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch"
         set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch"
         set_setting_value "$raconf" "log_dir" "$logs_folder" "retroarch"
+        set_setting_value "$raconf" "rgui_browser_directory" "$roms_folder" "retroarch"
+        
+        # Specific Settings for ScummVM core
+        cp -fv "$emuconfigs/retroarch/scummvm.ini" "$ra_scummvm_conf"
+        create_dir "$mods_folder/RetroArch/ScummVM/icons"
+        create_dir "$mods_folder/RetroArch/ScummVM/extra"
+        create_dir "$mods_folder/RetroArch/ScummVM/themes"
+        set_setting_value "$ra_scummvm_conf" "iconspath" "$mods_folder/RetroArch/ScummVM/icons" "libretro_scummvm" "scummvm"
+        set_setting_value "$ra_scummvm_conf" "extrapath" "$mods_folder/RetroArch/ScummVM/extra" "libretro_scummvm" "scummvm"
+        set_setting_value "$ra_scummvm_conf" "themepath" "$mods_folder/RetroArch/ScummVM/themes" "libretro_scummvm" "scummvm"
+        set_setting_value "$ra_scummvm_conf" "savepath" "$saves_folder/scummvm" "libretro_scummvm" "scummvm"
+        set_setting_value "$ra_scummvm_conf" "browser_lastpath" "$roms_folder/scummvm" "libretro_scummvm" "scummvm"
       fi
       # Shared actions
 
@@ -666,9 +678,9 @@ prepare_component() {
     log i "----------------------"
 
     create_dir "/var/config/gzdoom"
-    create_dir "/var/data/gzdoom"
+    create_dir -d "/var/data/gzdoom"
     cp -fvr "$emuconfigs/gzdoom/gzdoom.ini" "/var/config/gzdoom"
-    cp -fvr "$emuconfigs/gzdoom/gzdoom.pk3" "/var/data/gzdoom"
+    cp -fvr "$emuconfigs/gzdoom/"*".pk3" "/var/data/gzdoom"
 
     sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON
     sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON

net.retrodeck.retrodeck.appdata.xml

@@ -65,7 +65,7 @@
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
-      <release version="0.8.0b" date="2023-03-06">
+      <release version="0.8.0b" date="2023-03-07">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.0b</url>
          <description>
             <p>
@@ -114,6 +114,8 @@
                <li>Fixed DUCKSTATION memory card folder</li>
                <li>Fixed RPCS3 saves folder (wrong symlink) - WARN THE USERS TO BACKUP</li>
                <li>Fixed some issues that preventing RetroDECK to be built locally</li>
+               <li>SCUMMVM: fixed a bug where some paths were not existing</li>
+               <li>RETROARCH: fixed a bug where the default folder was not the rom folder in the rgui</li>
             </ul>
             <p>Issues:</p>
             <ul>

net.retrodeck.retrodeck.yml

@@ -1207,6 +1207,7 @@ modules:
   # SOLARUS - END
 
   # GZDoom - Start
+  # When updating remember to update all the .pk3 files from the standalone linux download
   - rd-submodules/shared-modules/gzdoom/gzdoom.json
   # GZDoom - END
   

retrodeck.sh

@@ -56,9 +56,9 @@ https://retrodeck.net
       ;;
     --reset-component*)
       echo "You are about to reset one or more RetroDECK components or emulators."
-      echo "Available options are: es-de, retroarch, cemu, dolphin, duckstation, melonds, pcsx3, pico8, ppsspp, primehack, ryujinx. rpcs3, ryujinx, xemu, vita3k, mame, gzdoom, boilr, all"
+      echo "Available options are: es-de, retroarch, cemu, dolphin, duckstation, gzdoom, melonds, pcsx3, pico8, ppsspp, primehack, ryujinx, rpcs3, ryujinx, xemu, vita3k, mame, boilr, all"
       read -p "Please enter the component you would like to reset: " component
-      if [[ "$component" =~ ^(es-de|retroarch|cemu|dolphin|duckstation|mame|melonds|pcsx2|ppsspp|primehack|ryujinx|rpcs3|xemu|all)$ ]]; then
+      if [[ "$component" =~ ^(es-de|retroarch|cemu|dolphin|duckstation|gzdoom|mame|melonds|pcsx2|ppsspp|primehack|ryujinx|rpcs3|xemu|all)$ ]]; then
         read -p "You are about to reset $component to default settings. Enter 'y' to continue, 'n' to stop: " response
         if [[ $response == [yY] ]]; then
           prepare_component "reset" "$component" "cli"