Cooker to Main - Post Update fixes

.github/workflows/build_components.yml

@@ -672,28 +672,34 @@ jobs:
           cat "$RELEASE_BODY_FILE" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Set Make Latest
-        run: |
-          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
-            MAKE_LATEST=true
-          else
-            MAKE_LATEST=false
-          fi
-          echo "MAKE_LATEST=$MAKE_LATEST" >> $GITHUB_ENV
-
       - name: Generate Version Tag
         id: version-tag
         run: |
           # Get the current date and time in GMT
           CURRENT_DATE=$(date -u +"%Y%m%d-%H%M")
-          # Check if the branch is main or not
+
+          # Default: not latest
+          MAKE_LATEST=false
+
+          # Branch-based tagging: main -> main-..., everything else -> cooker-...
           if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
             TAG="main-${CURRENT_DATE}"
+            MAKE_LATEST=true
           else
             TAG="cooker-${CURRENT_DATE}"
+            MAKE_LATEST=false
           fi
+
+          # Set target repo name (repo part of owner/repo)
+          REPO_NAME="${GITHUB_REPOSITORY#*/}"
+
+          # Export values
           echo "TAG=$TAG" >> $GITHUB_ENV
+          echo "MAKE_LATEST=$MAKE_LATEST" >> $GITHUB_ENV
+          echo "REPO_NAME=$REPO_NAME" >> $GITHUB_ENV
+
           echo "TAG=$TAG" >> $GITHUB_OUTPUT
+          echo "MAKE_LATEST=$MAKE_LATEST" >> $GITHUB_OUTPUT
 
       - name: Publish release
         uses: ncipollo/release-action@v1

automation-tools/alchemist/desired_versions.sh

@@ -209,7 +209,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # Source: AppImage
 # ------------------------------------------------------------------------------
 # MAIN (Stable)
-  export PCSX2_DESIRED_VERSION="v2.5.409"
+  export PCSX2_DESIRED_VERSION="v2.6.1"
 
 # COOKER (Override)
 # export PCSX2_DESIRED_VERSION="newest"
@@ -341,7 +341,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # Repo: https://github.com/RetroDECK/Vita3K-bin
 # ------------------------------------------------------------------------------
 # MAIN (Stable)
-  export VITA3K_DESIRED_VERSION="3869"
+  export VITA3K_DESIRED_VERSION="3872"
 
 # COOKER (Override)
 # export VITA3K_DESIRED_VERSION="latest"
@@ -549,8 +549,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # ------------------------------------------------------------------
 
 if [[ "${GITHUB_REF_NAME:-}" != "main" ]]; then
-    # Non‑main branches use the “cooker‑latest” build tag
-    export FRAMEWORK_DESIRED_VERSION="cooker-latest on $(date +%Y-%m-%d)"
+    # Non‑main branches use the “latest-cooker” build tag
+    export FRAMEWORK_DESIRED_VERSION="latest-cooker on $(date +%Y-%m-%d)"
 else
     # Main branch uses the “main‑latest” build tag
     export FRAMEWORK_DESIRED_VERSION="main-latest on $(date +%Y-%m-%d)"

azahar/component_prepare.sh

@@ -29,5 +29,5 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   dir_prep "$texture_packs_path/Azahar/textures" "$azahar_textures_path"
   dir_prep "$shaders_path/Azahar/" "$azahar_shaders_path"
   dir_prep "$logs_path/Azahar/" "$azahar_logs_path"
-  dir_prep "$cheats/Azahar/" "$azahar_cheats_path"
+  dir_prep "$cheats_path/Azahar/" "$azahar_cheats_path"
 fi

azahar/component_update.sh

@@ -9,7 +9,10 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   # - Init Azahar as it is a new emulator
   # - Migrate legacy Citra saves to Azahar saves dir
 
+  log i "0.10.0b Upgrade - Reset: Azahar"
+
   prepare_component "reset" "azahar"
+
   if [[ -d "$XDG_DATA_HOME/citra-emu/nand" ]]; then
     move "$XDG_DATA_HOME/citra-emu/nand" "$saves_path/n3ds/azahar/"
   fi

cemu/component_update.sh

@@ -10,3 +10,14 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.7.0b") == "true"
 
   prepare_component "reset" "cemu"
 fi
+
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+
+  log i "0.10.0b Upgrade - Postmove: Cemu"
+
+  prepare_component "postmove" "cemu"
+
+  if [[ -e "$bios_path/cemu/keys.txt" ]]; then
+    rm -rf "$XDG_DATA_HOME/Cemu/keys.txt" && ln -s "$bios_path/cemu/keys.txt" "$XDG_DATA_HOME/Cemu/keys.txt" && log d "Linked $bios_path/cemu/keys.txt to $XDG_DATA_HOME/Cemu/keys.txt"
+  fi
+fi

dolphin/component_update.sh

@@ -35,10 +35,13 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.9.1b") == "true"
 fi
 
 if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
-  log i "Dolphin team suggest to run Dolphin in single core, setting it"
+  log i "0.10.0b Upgrade - Postmove: Dolphin with Config Changes"
+
   set_setting_value "$dolphin_config" "CPUThread" "False" "dolphin" "Core"
   set_setting_value "$dolphin_config" "LanguageCode" " " "dolphin" "Interface"
 
+  prepare_component "postmove" "dolphin"
+
 fi
 
 #######################################

duckstation/component_update.sh

@@ -43,3 +43,11 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.7.0b") == "true"
   set_setting_value "$duckstationconf" "SaveStateOnExit" "false" "duckstation" "Main"
   set_setting_value "$duckstationconf" "Enabled" "false" "duckstation" "Cheevos"
 fi
+
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+
+  log i "0.10.0b Upgrade - Postmove: Duckstation (Legacy)"
+
+  prepare_component "postmove" "duckstation"
+
+fi

es-de/component_prepare.sh

@@ -13,6 +13,7 @@ if [[ "$action" == "reset" ]]; then
   create_dir "$XDG_CONFIG_HOME/ES-DE/settings"
   log d "Preparing es_settings.xml"
   cp -f "$component_config/es_settings.xml" "$es_de_config"
+  set_setting_value "$es_de_config" "Theme" "RetroDECK-theme-main" "es_settings"
   set_setting_value "$es_de_config" "ROMDirectory" "$roms_path" "es_settings"
   set_setting_value "$es_de_config" "MediaDirectory" "$downloaded_media_path" "es_settings"
   set_setting_value "$es_de_config" "UserThemeDirectory" "$themes_path" "es_settings"
@@ -36,4 +37,9 @@ if [[ "$action" == "postmove" ]]; then
   set_setting_value "$es_de_config" "MediaDirectory" "$downloaded_media_path" "es_settings"
   set_setting_value "$es_de_config" "UserThemeDirectory" "$themes_path" "es_settings"
   dir_prep "$rd_home_path/ES-DE/gamelists" "$XDG_CONFIG_HOME/ES-DE/gamelists"
+  dir_prep "$rd_home_path/ES-DE/collections" "$XDG_CONFIG_HOME/ES-DE/collections"
+  dir_prep "$rd_home_path/ES-DE/scripts" "$XDG_CONFIG_HOME/ES-DE/scripts"
+  dir_prep "$rd_home_path/ES-DE/screensavers" "$XDG_CONFIG_HOME/ES-DE/screensavers"
+  dir_prep "$rd_home_path/ES-DE/custom_systems" "$XDG_CONFIG_HOME/ES-DE/custom_systems"
+  dir_prep "$logs_path/ES-DE" "$XDG_CONFIG_HOME/ES-DE/logs"
 fi

es-de/component_update.sh

@@ -71,7 +71,10 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   # With the RetroDECK Neo the theme folder is changed, so if the user set the RetroDECK Theme we need to fix the name in the config
 
   if [[ $(get_setting_value "$es_de_config" "Theme" "es_settings") == "retrodeck" ]]; then
-    log i "Default RetroDECK theme is set, fixing theme name in ES-DE config."
+    log i "0.10.0b Upgrade - Postmove: ES-DE - Default RetroDECK theme is set, fixing theme name in ES-DE config"
     set_setting_value "$es_de_config" "Theme" "RetroDECK-theme-main" "es_settings"
+
+    prepare_component "postmove" "es-de"
   fi
 fi
+

flips/component_update.sh

@@ -8,5 +8,7 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   # In version 0.10.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
   # - Init FLIPS as it is a new emulator
 
+  log i "0.10.0b Upgrade - Reset: Flips"
+
   prepare_component "reset" "flips"
 fi

framework/component_update.sh

@@ -497,8 +497,12 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.9.2b") == "true"
 fi
 
 if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+  set_setting_value "$rd_conf" "storage_path" "$rd_home_path/storage" "retrodeck" "paths"
+  create_dir "$storage_path"
+  set_setting_value "$rd_conf" "videos_path" "$rd_home_path/videos" "retrodeck" "paths"
+  create_dir "$videos_path"
+
   create_dir -d "$XDG_CONFIG_HOME/retrodeck/graphics"
   cp -rf "/app/retrodeck/graphics/folder-iconsets" "$XDG_CONFIG_HOME/retrodeck/graphics/"
   set_setting_value "$rd_conf" "iconset" "lahrs-main" "retrodeck" "options"
-  handle_folder_iconsets "lahrs-main"
 fi

gzdoom/component_update.sh

@@ -9,3 +9,12 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.8.0b") == "true"
 
   prepare_component "reset" "gzdoom"
 fi
+
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+
+  log i "0.10.0b Upgrade - Reset: GZDoom"
+
+  prepare_component "reset" "gzdoom"
+
+  # GZDOOM needs to be reset as the changes are in the config that connects to the new folders.
+fi

mame/component_update.sh

@@ -38,35 +38,12 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.9.1b") == "true"
   rm -rf "$XDG_DATA_HOME/mame/cheat"
 fi
 
-# Legacy XDG Folders
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
 
-# create_dir "$XDG_DATA_HOME/mame/plugin-data"
-# create_dir "$XDG_DATA_HOME/mame/hash"
-# create_dir "$XDG_DATA_HOME/mame/assets/artwork"
-# create_dir "$XDG_DATA_HOME/mame/assets/fonts"
-# create_dir "$XDG_DATA_HOME/mame/assets/crosshair"
-# create_dir "$XDG_DATA_HOME/mame/plugins"
-# create_dir "$XDG_DATA_HOME/mame/assets/language"
-# create_dir "$XDG_DATA_HOME/mame/assets/software"
-# create_dir "$XDG_DATA_HOME/mame/assets/comments"
-# create_dir "$XDG_DATA_HOME/mame/assets/share"
-# create_dir "$XDG_DATA_HOME/mame/dats"
-# create_dir "$XDG_DATA_HOME/mame/folders"
-# create_dir "$XDG_DATA_HOME/mame/assets/cabinets"
-# create_dir "$XDG_DATA_HOME/mame/assets/cpanel"
-# create_dir "$XDG_DATA_HOME/mame/assets/pcb"
-# create_dir "$XDG_DATA_HOME/mame/assets/flyers"
-# create_dir "$XDG_DATA_HOME/mame/assets/titles"
-# create_dir "$XDG_DATA_HOME/mame/assets/ends"
-# create_dir "$XDG_DATA_HOME/mame/assets/marquees"
-# create_dir "$XDG_DATA_HOME/mame/assets/artwork-preview"
-# create_dir "$XDG_DATA_HOME/mame/assets/bosses"
-# create_dir "$XDG_DATA_HOME/mame/assets/logo"
-# create_dir "$XDG_DATA_HOME/mame/assets/scores"
-# create_dir "$XDG_DATA_HOME/mame/assets/versus"
-# create_dir "$XDG_DATA_HOME/mame/assets/gameover"
-# create_dir "$XDG_DATA_HOME/mame/assets/howto"
-# create_dir "$XDG_DATA_HOME/mame/assets/select"
-# create_dir "$XDG_DATA_HOME/mame/assets/icons"
-# create_dir "$XDG_DATA_HOME/mame/assets/covers"
-# create_dir "$XDG_DATA_HOME/mame/assets/ui"
+  log i "0.10.0b Upgrade - Reset: MAME"
+
+  prepare_component "reset" "mame"
+
+  # MAME needs to be reset because of major config changes.
+
+fi

melonds/component_recipe.json

@@ -46,6 +46,11 @@
           "type": "file",
           "source": "$REPO_ROOT/$COMPONENT_NAME/component_prepare.sh",
           "dest": "$COMPONENT_ARTIFACT_ROOT"
+        },
+        {
+          "type": "file",
+          "source": "$REPO_ROOT/$COMPONENT_NAME/component_update.sh",
+          "dest": "$COMPONENT_ARTIFACT_ROOT"
         }
       ],
       "libs": [

melonds/component_update.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+#########################################################################
+# These actions happen conditionally based on the version being upgraded
+#########################################################################
+

openbor/component_update.sh

@@ -8,5 +8,7 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true
   # In version 0.10.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
   # - Init OpenBOR as it is a new emulator
 
+  log i "0.10.0b Upgrade - Reset: OpenBOR"
+
   prepare_component "reset" "openbor"
 fi

pcsx2/component_update.sh

@@ -25,3 +25,18 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.9.1b") == "true"
   set_setting_value "$pcsx2conf" "Cheats" "$cheats_path/PCSX2" "Folders"
   tar --strip-components=1 -xzf "/app/retrodeck/cheats/pcsx2.tar.gz" -C "$cheats_path/PCSX2" --overwrite && log i "Cheats for PCSX2 installed"
 fi
+
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+  log i "0.10.0b Upgrade: PCSX2 - Postmove, mods and cheats and folder creation"
+
+  create_dir -d "$screenshots_path/PCSX2"
+  create_dir -d "$logs_path/PCSX2"
+  create_dir -d "$cheats_path/PCSX2/cheats_ws"
+  create_dir -d "$cheats_path/PCSX2/cheats_ni"
+  tar -xzf "$component_extras/pcsx2-cheats.tar.gz" -C "$cheats_path/PCSX2" --overwrite
+  create_dir -d "$storage_path/PCSX2/covers"
+  create_dir -d "$texture_packs_path/PCSX2/textures"
+  create_dir -d "$videos_path/PCSX2"
+  prepare_component "postmove" "pcxs2"
+  tar -xzf "$component_extras/pcsx2-patches.tar.gz" -C "$mods_path/PCSX2/patches" --overwrite
+fi

portmaster/component_prepare.sh

@@ -18,4 +18,5 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   create_dir "$XDG_DATA_HOME/PortMaster/config/"
   cp "$component_config/config.json" "$XDG_DATA_HOME/PortMaster/config/config.json"
   set_setting_value "$rd_conf" "portmaster_path" "$rd_home_path/PortMaster" "retrodeck" "paths"
+  create_dir "$portmaster_path"
 fi

ppsspp/component_prepare.sh

@@ -23,14 +23,14 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   log i "Preparing PPSSPP cheats"
   create_dir -d "$cheats_path/PPSSPP"
   dir_prep "$cheats_path/PPSSPP" "$ppsspp_cheats_path"
-  if [[ -d "$cheats_path/PPSSPP" && "$(ls -A "$cheats_path"/PPSSPP-SA)" ]]; then
+  if [[ -d "$cheats_path/PPSSPP" && "$(ls -A "$cheats_path"/PPSSPP)" ]]; then
     backup_file="$backups_path/cheats/PPSSPP-$(date +%y%m%d).tar.gz"
     create_dir "$(dirname "$backup_file")"
     tar -czf "$backup_file" -C "$cheats_path" PPSSPP
     log i "PPSSPP cheats backed up to $backup_file"
   fi
 
-  unzip -q -o -j "$component_extras/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP-SA/"
+  unzip -q -o -j "$component_extras/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP"
 
   log i "Preparing PPSSPP BIOS"
   create_dir -d "$bios_path/PPSSPP"

ppsspp/component_update.sh

@@ -30,3 +30,12 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.9.1b") == "true"
   set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos")" "retrodeck" "cheevos"
   set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore"
 fi
+
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+
+  log i "0.10.0b Upgrade - Postmove: PPSSPP"
+
+  prepare_component "postmove" "ppsspp"
+
+  unzip -q -o -j "$component_extras/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP"
+fi

primehack/assets/rd_config/config/Dolphin.ini

@@ -8,7 +8,7 @@ SIDevice1 = 0
 SIDevice2 = 0
 SIDevice3 = 0
 AutoDiscChange = False
-CPUThread = True
+CPUThread = False
 EnableCheats = False
 OverrideRegionSettings = False
 EnablePrimeHack = True

primehack/component_update.sh

@@ -37,6 +37,15 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.7.0b") == "true"
   set_setting_value "$primehackconf" "ConfirmStop" "False" "primehack" "Interface"
 fi
 
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true" ]]; then
+
+  log i "0.10.0b Upgrade - Postmove: PrimeHack"
+
+  set_setting_value "$primehack_config" "CPUThread" "False" "primehack" "Core"
+  set_setting_value "$primehack_config" "LanguageCode" " " "primehack" "Interface"
+  prepare_component "postmove" "primehack"
+fi
+
 #######################################
 # These actions happen at every update
 #######################################