Merge branch 'cooker' of https://github.com/monkeyx-net/RetroDECK_UK into cooker

.github/workflows/cooker-selfhosted.yml

@@ -166,6 +166,8 @@ jobs:
           fi
           git tag "${{ env.TAG }}"             # Create the tag locally               
           git push origin "${{ env.TAG }}"     # Push the new tag in the remote repo
+        env:
+          GITHUB_TOKEN: ${{ secrets.TRIGGER_BUILD_TOKEN }}
 
       # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
       - name: Upload RetroDECK-cooker.flatpak

automation_tools/automation_task_list.cfg

@@ -6,6 +6,7 @@
 latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
 outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
 branch^THISBRANCH
+THISREPO^THISREPO
 
 hash^RASHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch.7z
 hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip

automation_tools/pre_build_automation.sh

@@ -51,7 +51,18 @@ get_current_branch() {
   fi
 }
 
+# Retrieve the repository URL
+get_repo_url() {
+  local repo_url=$(git config --get remote.origin.url)
+  # Convert SSH URL to HTTPS if needed
+  if [[ "$repo_url" == git@* ]]; then
+    repo_url=$(echo "$repo_url" | sed -e 's|git@|https://|' -e 's|:|/|')
+  fi
+  echo "$repo_url"
+}
+
 current_branch=$(get_current_branch)
+current_repo_url=$(get_repo_url)
 
 echo "Manifest location: $rd_manifest"
 echo "Automation task list location: $automation_task_list"
@@ -170,6 +181,13 @@ handle_url() {
   /bin/sed -i 's^'"$placeholder"'^'"$calculated_url"'^g' "$rd_manifest"
 }
 
+# Handle the THISREPO placeholder
+handle_thisrepo() {
+  local placeholder="$1"
+  echo "Replacing placeholder $placeholder with repository URL $current_repo_url"
+  /bin/sed -i 's^'"$placeholder"'^'"$current_repo_url"'^g' "$rd_manifest"
+}
+
 # Process the task list
 while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do
   if [[ ! "$action" == "#"* ]] && [[ -n "$action" ]]; then
@@ -184,6 +202,8 @@ while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do
       "outside_env_var" ) handle_outside_env_var "$placeholder" "$url" ;;
       "custom_command" ) handle_custom_command "$url" ;;
       "url" ) handle_url "$placeholder" "$url" ;;
+      "THISREPO" ) handle_thisrepo "$placeholder" ;;
     esac
   fi
 done < "$automation_task_list"
+

config/es-de/es_settings.xml

@@ -153,13 +153,12 @@
 <string name="ScreensaverType" value="video" />
 <string name="StartupSystem" value="" />
 <string name="SystemsSorting" value="manufacturer_hwtype_year" />
-<string name="Theme" value="art-book-next-es-de" />
+<string name="Theme" value="retrodeck" />
 <string name="ThemeAspectRatio" value="automatic" />
-<string name="ThemeColorScheme" value="art-book-next" />
-<string name="ThemeFontSize" value="" />
-<string name="ThemeSet" value="art-book-next-es-de" />
+<string name="ThemeColorScheme" value="retrodeck" />
+<string name="ThemeFontSize" value="medium" />
 <string name="ThemeTransitions" value="automatic" />
-<string name="ThemeVariant" value="system-multi-gamelist-list-immersive" />
+<string name="ThemeVariant" value="carousel" />
 <string name="UIMode" value="full" />
 <string name="UIMode_passkey" value="uuddlrlrba" />
 <string name="UserThemeDirectory" value="" />

functions/post_update.sh

@@ -352,7 +352,7 @@ post_update() {
   if [[ $(check_version_is_older_than "0.8.3b") == "true" ]]; then
     # In version 0.8.3b, the following changes were made:
     # - Recovery from a failed move of the themes, downloaded_media and gamelists folder to their new ES-DE locations.
-    if [[ !-d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
+    if [[ ! -d "$rdhome/ES-DE/themes" || ! -d "$rdhome/ES-DE/downloaded_media" || ! -d "$rdhome/ES-DE/gamelists" ]]; then
     log i "Moving ES-DE downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\" due to a RetroDECK Framework bug"
       if [[ -d "$rdhome/themes" && ! -d "$rdhome/ES-DE/themes" ]]; then
         move "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed"

net.retrodeck.retrodeck.yml

@@ -90,7 +90,7 @@ modules:
         echo "Version is $VERSION"
     sources:
       - type: git
-        url: https://github.com/RetroDECK/RetroDECK.git
+        url: THISREPO
         branch: THISBRANCH
 
   - name: xmlstarlet
@@ -178,7 +178,7 @@ modules:
         sha256: f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4
         dest: fontconfig
       - type: git
-        url: https://github.com/RetroDECK/RetroDECK.git
+        url: THISREPO
         branch: THISBRANCH
         
   # RetroArch
@@ -649,5 +649,5 @@ modules:
 
     sources:
       - type: git
-        url: https://github.com/RetroDECK/RetroDECK.git
+        url: THISREPO
         branch: THISBRANCH