Merge branch 'cooker-0.8.1b' into feat/steam-rom-manager

functions/dialogs.sh

@@ -175,8 +175,7 @@ changelog_dialog() {
   else
     local version_changelog=$(xml sel -t -m "//release[@version='$1']/description" -v . -n $rd_appdata | tr -s '\n' | sed 's/^\s*//')
 
-    echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" 
+    echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" 2>/dev/null
-    "$version_changelog" >> "/var/config/retrodeck/changelog-partial.txt"
 
     zenity --icon-name=net.retrodeck.retrodeck --text-info --width=1200 --height=720 \
     --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \

functions/post_update.sh

@@ -300,6 +300,14 @@ post_update() {
 
   fi
 
+  if [[ $(check_version_is_older_than "0.8.1b") == "true" ]]; then
+    log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
+    dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
+    dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
+    mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists"
+    rm -rf "$rdhome/gamelists"
+  fi
+
   # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then
   #   # Placeholder for version 0.9.0b
   #   rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore

functions/prepare_component.sh

@@ -10,7 +10,7 @@ prepare_component() {
   # USAGE: prepare_component "$action" "$component" "$call_source(optional)"
 
   action="$1"
-  component="$2"
+  component=$(echo "$2" | tr '[:upper:]' '[:lower:]')
   call_source="$3"
 
   log d "Preparing component: \"$component\", action: \"$action\""
@@ -48,7 +48,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset
+  if [[ "$component" =~ ^(es-de|all)$ ]]; then # For use after ESDE-related folders are moved or a reset
       log i "--------------------------------"
       log i "Prepearing ES-DE"
       log i "--------------------------------"
@@ -60,7 +60,8 @@ prepare_component() {
       set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings"
       set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings"
       set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings"
-      dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists"
+      dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists"
+      dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections"
       dir_prep "$rd_logs_folder/ES-DE" "$es_source_logs"
       log d "Generating roms system folders"
       #es-de --home /var/config/ES-DE --create-system-dirs
@@ -75,7 +76,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(retroarch|RetroArch|all)$ ]]; then
+  if [[ "$component" =~ ^(retroarch|all)$ ]]; then
       log i "--------------------------------"
       log i "Prepearing RetroArch"
       log i "--------------------------------"
@@ -202,7 +203,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(citra|citra-emu|Citra|all)$ ]]; then
+  if [[ "$component" =~ ^(citra|citra-emu|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "------------------------"
       log i "Prepearing CITRA"
@@ -247,7 +248,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(cemu|Cemu|all)$ ]]; then
+  if [[ "$component" =~ ^(cemu|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing CEMU"
@@ -274,7 +275,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(dolphin|dolphin-emu|Dolphin|all)$ ]]; then
+  if [[ "$component" =~ ^(dolphin|dolphin-emu|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing DOLPHIN"
@@ -327,7 +328,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(duckstation|Duckstation|all)$ ]]; then
+  if [[ "$component" =~ ^(duckstation|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "------------------------"
       log i "Prepearing DUCKSTATION"
@@ -372,7 +373,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(melonds|melonDS|MelonDS|all)$ ]]; then
+  if [[ "$component" =~ ^(melonds|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing MELONDS"
@@ -410,7 +411,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(pcsx2|PCSX2|all)$ ]]; then
+  if [[ "$component" =~ ^(pcsx2|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing PCSX2"
@@ -464,7 +465,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(ppsspp|PPSSPP|all)$ ]]; then
+  if [[ "$component" =~ ^(ppsspp|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "------------------------"
       log i "Prepearing PPSSPPSDL"
@@ -492,7 +493,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(primehack|Primehack|all)$ ]]; then
+  if [[ "$component" =~ ^(primehack|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing Primehack"
@@ -535,7 +536,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(rpcs3|RPCS3|all)$ ]]; then
+  if [[ "$component" =~ ^(rpcs3|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "------------------------"
       log i "Prepearing RPCS3"
@@ -571,7 +572,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(ryujinx|Ryujinx|all)$ ]]; then
+  if [[ "$component" =~ ^(ryujinx|all)$ ]]; then
     # NOTE: for techincal reasons the system folder of Ryujinx IS NOT a sumlink of the bios/switch/keys as not only the keys are located there
     # When RetroDECK starts there is a "manage_ryujinx_keys" function that symlinks the keys only in Rryujinx/system.
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
@@ -615,7 +616,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(yuzu|Yuzu|all)$ ]]; then
+  if [[ "$component" =~ ^(yuzu|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing YUZU"
@@ -668,7 +669,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(xemu|XEMU|all)$ ]]; then
+  if [[ "$component" =~ ^(xemu|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "------------------------"
       log i "Prepearing XEMU"
@@ -712,7 +713,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(vita3k|Vita3K|all)$ ]]; then
+  if [[ "$component" =~ ^(vita3k|all)$ ]]; then
     if [[ "$action" == "reset" ]]; then # Run reset-only commands
       log i "----------------------"
       log i "Prepearing Vita3K"
@@ -736,7 +737,7 @@ prepare_component() {
     fi
   fi
 
-  if [[ "$component" =~ ^(mame|MAME|all)$ ]]; then
+  if [[ "$component" =~ ^(mame|all)$ ]]; then
     # TODO: do a proper script
     # This is just a placeholder script to test the emulator's flow
     log i "----------------------"
@@ -801,7 +802,7 @@ prepare_component() {
 
   fi
 
-  if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then
+  if [[ "$component" =~ ^(gzdoom|all)$ ]]; then
     # TODO: do a proper script
     # This is just a placeholder script to test the emulator's flow
     log i "----------------------"
@@ -821,7 +822,7 @@ prepare_component() {
     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
   fi
 
-  if [[ "$component" =~ ^(steam rom manager|STEAM ROM MANAGER|all)$ ]]; then
+  if [[ "$component" =~ ^(steam rom manager|all)$ ]]; then
     log i "----------------------"
     log i "Prepearing STEAM ROM MANAGER"
     log i "----------------------"
@@ -831,7 +832,7 @@ prepare_component() {
     cp -fvr "/app/libexec/steam-sync/userConfigurations.json" "/var/config/steam-rom-manager/userData"
   fi
 
-  if [[ ! "$component" =~ ^(retrodeck|es-de|ES-DE|retroarch|RetroArch|citra|citra-emu|Citra|cemu|Cemu|dolphin|dolphin-emu|Dolphin|duckstation|Duckstation|melonds|melonDS|MelonDS|pcsx2|PCSX2|pico8|pico-8|ppsspp|PPSSPP|primehack|Primehack|rpcs3|RPCS3|ryujinx|Ryujinx|yuzu|Yuzu|xemu|XEMU|vita3k|Vita3K|mame|MAME|gzdoom|GZDOOM|steam rom manager|STEAM ROM MANAGER|)$ ]]; then
+  if [[ ! "$component" =~ ^(retrodeck|es-de|retroarch|citra|citra-emu|cemu|dolphin|dolphin-emu|duckstation|melonds|melonDS|pcsx2|pico8|pico-8|ppsspp|primehack|rpcs3|ryujinx|yuzu|xemu|vita3k|mame|gzdoom|steam rom manager|)$ ]]; then
     log e "Supplied component $component not found, not resetting"
   fi
 

net.retrodeck.retrodeck.appdata.xml

@@ -60,9 +60,26 @@
       <p>Discord: https://discord.gg/WDc5C9YWMx 
          (If you want to help out with the project join the "i-want-to-help" channel)</p>
    </description>
+   <branding>
+      <color type="primary" scheme_preference="light">#94a6fb</color>
+      <color type="primary" scheme_preference="dark">#404b98</color>
+   </branding>
    <project_license>GPL-3.0</project_license>
    <metadata_license>CC0-1.0</metadata_license>
    <releases>
+      <release version="0.8.1b" date="2024-04-18">
+         <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.1b</url>
+         <description>
+            <p>Changes:</p>
+            <ul>
+               <li>PLACEHOLDER</li>
+            </ul>
+            <p>Known issues:</p>
+            <ul>
+               <li>Please check the know issues in the Wiki under General Infomration.</li>
+            </ul>
+         </description>
+      </release>
       <release version="0.8.0b" date="2024-04-17">
          <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.8.0b</url>
          <description>

net.retrodeck.retrodeck.yml

@@ -72,14 +72,14 @@ modules:
   #
   # UPDATE STEPS FOR MAIN:
   # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH"
-  # [ ] Update the appdata.xml with the version number and notes
+  # [x] Update the appdata.xml with the version number and notes
   #
   - name: version-initialization
     buildsystem: simple
     build-commands:
       - |
 
-        # on main please update this with the version variable, eg: VERSION='0.7.4b'
+        # on main please update this with the version variable, eg: VERSION=0.8.0b
         # on cooker will be THISBRANCH
         VERSION=THISBRANCH
 
@@ -430,7 +430,7 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK-ES-DE
-        branch: update/3.1
+        branch: retrodeck-main
       - type: shell
 
   # ES-DE - END

retrodeck.sh

@@ -58,6 +58,7 @@ https://retrodeck.net
       echo "You are about to reset one or more RetroDECK components or emulators."
       echo "Available options are: es-de, retroarch, cemu, dolphin, duckstation, gzdoom, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, ryujinx, xemu, vita3k, mame, boilr, all"
       read -p "Please enter the component you would like to reset: " component
+      component=$(echo "$component" | tr '[:upper:]' '[:lower:]')
       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