Merge pull request #9 from RetroDECK/cooker

Cooker to Main - Post Update fixes

Author: Lazorne

.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