Merge 0a838056ff into 82195a562c

.github/workflows/cooker-selfhosted.yml

@@ -8,8 +8,8 @@ on:
     paths:
      - '.github/workflows/**'
      - 'automation_tools/**'
-     - 'emu-configs/**'
-     - 'es-configs/**'
+     - 'config/**'
+     - 'config/es-de/**'
      - 'functions/**'
      - 'rd-submodules/**'
      - '*.sh'
@@ -30,6 +30,7 @@ jobs:
 
   Building_RetroDECK:
     runs-on: self-hosted
+    #runs-on: ubuntu-latest
     steps:
 
       # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317
@@ -115,14 +116,6 @@ jobs:
       - name: Build flatpak
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh"
 
-      - name: Create Artifact for flathub
-        run: | 
-          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
-          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
-          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
-          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
-        continue-on-error: true
-
       - name: Create Bundle
         run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_bundle.sh"
 
@@ -183,6 +176,14 @@ jobs:
           path: RetroDECK-cooker.flatpak
         continue-on-error: true
 
+      - name: Create Artifact for flathub
+        run: | 
+          tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker .
+          hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz))
+          echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha
+          mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }}
+        continue-on-error: true
+
       # - name: Upload RetroDECK-cooker.flatpak to Gitea Release
       #   run: |
       #     # Set variables for Gitea host, organization, repository, access token, and release details

.github/workflows/main-selfhosted.yml

@@ -7,8 +7,8 @@ on:
     paths:
      - '.github/workflows/**'
      - 'automation_tools/**'
-     - 'emu-configs/**'
-     - 'es-configs/**'
+     - 'config/**'
+     - 'config/es-de/**'
      - 'functions/**'
      - 'rd-submodules/**'
      - '*.sh'

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "rd-submodules/shared-modules"]
-	path = rd-submodules/shared-modules
-	url = https://github.com/flathub/shared-modules.git
-[submodule "rd-submodules/retroarch"]
-	path = rd-submodules/retroarch
-	url = https://github.com/flathub/org.libretro.RetroArch.git
-[submodule "rd-submodules/ryujinx"]
-	path = rd-submodules/ryujinx
-	url = https://github.com/flathub/org.ryujinx.Ryujinx

README.md

@@ -102,7 +102,7 @@ Read up here on how to help out, there is something for everyone:
 | [RetroDECK-website](https://github.com/XargonWan/RetroDECK-website)  | Where our website source code is |
 | [RetroDECK on Flathub](https://github.com/flathub/net.retrodeck.retrodeck) | Our little space in Flathub's organization                 |
 | [RetroDECK-MAME](https://github.com/XargonWan/RetroDECK-MAME)   | MAME is big to build, so it's pre-built here and then imported in the build |
-| [RetroDECK-ES-DE](https://github.com/XargonWan/RetroDECK-ES-DE)  | This is where we store our patched fork of ES-DE          |
+| [RetroDECK-ES-DE](https://github.com/RetroDECK/ES-DE)  | This is where we store our patched fork of ES-DE          |
 
 
 # The RetroDECK Wiki

automation_tools/automation_task_list.cfg

@@ -1,15 +1,34 @@
 # The proper format for this file is
 # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional)
 # hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip
-#hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
+# Please leave some newlines in the end of this file or it will break
+
+latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
+outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
+branch^THISBRANCH
+
+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
 hash^PPSSPPBIOSHASHPLACEHOLDER^https://github.com/hrydgard/ppsspp/archive/refs/heads/master.zip
 hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282full.zip
 hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip
 hash^VITA3KSHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip
 hash^RANIGHTLYCORESPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch_cores.7z
-hash^RETRODECKMAMEPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
-url^RETRODECKMAMEURLPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
-latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
-outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
-branch^THISBRANCH
+
+latestghreleasesha^RETRODECKESDEPLACEHOLDER^https://api.github.com/repos/RetroDECK/ES-DE/releases/latest^RetroDECK-ES-DE-Artifact.tar.gz
+latestghreleasesha^RETRODECKPPSSPPHASH^https://api.github.com/repos/RetroDECK/org.ppsspp.PPSSPP/releases/latest^RetroDECK-PPSSPP-Artifact.tar.gz
+latestghreleasesha^RETRODECKDOLPHINPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest^RetroDECK-dolphin-Artifact.tar.gz
+latestghreleasesha^RETRODECKSOLARUSPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest^RetroDECK-solarus-Artifact.tar.gz
+latestghreleasesha^RETRODECKPRIMEHACKPLACEHOLDER^https://api.github.com/repos/RetroDECK/io.github.shiiion.primehack/releases/latest^RetroDECK-primehack-Artifact.tar.gz
+latestghreleasesha^RETRODECKGZDOOMSHASPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.zdoom.GZDoom/releases/latest^RetroDECK-gzdoom-Artifact.tar.gz
+latestghreleasesha^RETRODECKMELONDSSHAPLACEHOLDER^https://api.github.com/repos/RetroDECK/net.kuribo64.melonDS/releases/latest^RetroDECK-melonds-Artifact.tar.gz
+latestghreleasesha^RETRODECKMAMEPLACEHOLDER^https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
+
+latestghrelease^RETRODECKMAMEURLPLACEHOLDER^https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest^RetroDECK-MAME-Artifact.tar.gz
+latestghrelease^RETRODECKESDEURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/ES-DE/releases/latest^RetroDECK-ES-DE-Artifact.tar.gz
+latestghrelease^RETRODECKPPSSPPURL^https://api.github.com/repos/RetroDECK/org.ppsspp.PPSSPP/releases/latest^RetroDECK-PPSSPP-Artifact.tar.gz
+latestghrelease^RETRODECKDOLPHINURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest^RetroDECK-dolphin-Artifact.tar.gz
+latestghrelease^RETRODECKSOLARUSURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.solarus_games.solarus.Launcher/releases/latest^RetroDECK-solarus-Artifact.tar.gz
+latestghrelease^RETRODECKPRIMEHACKURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/io.github.shiiion.primehack/releases/latest^RetroDECK-primehack-Artifact.tar.gz
+latestghrelease^RETRODECKGZDOOMSURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/org.zdoom.GZDoom/releases/latest^RetroDECK-gzdoom-Artifact.tar.gz
+latestghrelease^RETRODECKMELONDSURLPLACEHOLDER^https://api.github.com/repos/RetroDECK/net.kuribo64.melonDS/releases/latest^RetroDECK-melonds-Artifact.tar.gz

automation_tools/pre_build_automation.sh

@@ -1,20 +1,23 @@
 #!/bin/bash
 
+# Set script to exit immediately on any error
+set -e
+
 # For the file paths to work correctly, call this script with this command from the cloned repo folder root:
 # sh automation_tools/pre_build_automation.sh
 # Different actions need different information in the task list file
 # branch: This changes the placeholder text to the currently-detected GIT branch if an automated build was started from a PR environment.
 # hash: Finds the SHA256 hash of a file online and updates the placeholder in the manifest.
 #     Needs the URL of the file, in this line format: hash^PLACEHOLDERTEXT^url
-# latestcommit: Finds the most recent commit of a git repo and updated the placeholder in the manifest.
+# latestcommit: Finds the most recent commit of a git repo and updates the placeholder in the manifest.
 #     Needs the URL of the repo and the branch to find the latest commit from, in this line format: latestcommit^PLACEHOLDERTEXT^url^branch
 # latestghtag: Finds the most recent tag on a GitHub repo, for repos that don't have normal releases, but also shouldn't use the latest commit
 #     Needs the URL of the repo, in this line format: latestghtag^PLACEHOLDERTEXT^url
 # latestghrelease: Finds the download URL and SHA256 hash of the latest release from a git repo.
-#     Needs the API URL of the repo, in this line format: latestappimage^PLACEHOLDERTEXT^https://api.github.com/repos/<owner-name>/<repo-name>/releases/latest^<file suffix>
+#     Needs the API URL of the repo, in this line format: latestghrelease^PLACEHOLDERTEXT^https://api.github.com/repos/<owner-name>/<repo-name>/releases/latest^<file suffix>
 #     As this command updates two different placeholders (one for the URL, one for the file hash) in the manifest,
 #     the URL that would be used in the above example is "PLACEHOLDERTEXT" and the hash placeholder text would be "HASHPLACEHOLDERTEXT"
-#     The "HASH" prefix of the placeholder text is hardcoded in the script
+#     The "HASH" prefix of the hash placeholder text is hardcoded in the script.
 #     The <file_suffix> will be the file extension or other identifying suffix at the end of the file name that can be used to select from multiple releases.
 #     Example: If there are these file options for a given release:
 #     yuzu-mainline-20240205-149629642.AppImage
@@ -23,24 +26,32 @@
 #     Entering "AppImage" (without quotes) for the <file_suffix> will identify yuzu-mainline-20240205-149629642.AppImage
 #     Entering "source-.tar.xz" (without quotes) for the <file_suffix> will identify yuzu-linux-20240205-149629642-source.tar.xz
 #     Entering "debug-tar.xz" (without quotes) for the <file_suffix> will identify yuzu-linux-20240205-149629642-debug.tar.xz
-#     As a file extension like ".tar.zx" can apply to multiple file options, the entire part that is appended to each release name should be included.
+#     As a file extension like ".tar.xz" can apply to multiple file options, the entire part that is appended to each release name should be included.
 #     The <file_suffix> will also only consider entries where the given suffix is at the end of the file name. So "AppImage" will identify "file.AppImage" but not "file.AppImage.zsync"
+# latestghreleasesha: Finds the SHA256 hash of a specific asset in the latest release from a git repo.
+#     Needs the API URL of the repo, in this line format: latestghreleasesha^PLACEHOLDERTEXT^https://api.github.com/repos/<owner-name>/<repo-name>/releases/latest^<file suffix>
+#     This command updates the placeholder in the manifest with the SHA256 hash of the specified asset.
 # outside_file: Prints the contents of a file from the build environment (such as the buildid file) and replaces the placeholder text with those contents.
 # outside_env_var: Gets the value of an environmental variable from the build environment (the output of "echo $var" from the terminal) and replaces the placeholder text with that value.
-# custom_command: Runs a single command explicitly as written in the $URL field of the task list, including variable and command expansion. This should work the same as if you were runnig the command directly from the terminal.
+# custom_command: Runs a single command explicitly as written in the $URL field of the task list, including variable and command expansion. This should work the same as if you were running the command directly from the terminal.
 #     This command does not need a PLACEHOLDERTEXT field in the task list, so needs to be in this syntax: custom_command^^$COMMAND
-# url: This is used to calculate a dynamic URL and the value to the $caluculated_url environmental variable, for use in other subsequent commands.
+# url: This is used to calculate a dynamic URL and the value to the $calculated_url environmental variable, for use in other subsequent commands.
 
-rd_manifest=${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml
-automation_task_list=${GITHUB_WORKSPACE}/automation_tools/automation_task_list.cfg
-current_branch=$(git rev-parse --abbrev-ref HEAD)
+# Define paths
+rd_manifest="${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml"
+automation_task_list="${GITHUB_WORKSPACE}/automation_tools/automation_task_list.cfg"
 
-# During the PR automated tests instead of the branch name is returned "HEAD", fixing it
-if [ $current_branch == "HEAD" ]; then
-  echo "Looks like we are on a PR environment, retrieving the branch name from which the PR is raised."
-  current_branch=$(echo $GITHUB_REF | sed 's@refs/heads/@@')
-  echo "The branch name from which the PR is raised is \"$current_branch\"."
+# Retrieve current git branch
+get_current_branch() {
+  local branch=$(git rev-parse --abbrev-ref HEAD)
+  if [ "$branch" == "HEAD" ]; then
+    echo "$GITHUB_REF" | sed 's@refs/heads/@@'
+  else
+    echo "$branch"
   fi
+}
+
+current_branch=$(get_current_branch)
 
 echo "Manifest location: $rd_manifest"
 echo "Automation task list location: $automation_task_list"
@@ -49,103 +60,130 @@ echo "Task list contents:"
 cat "$automation_task_list"
 echo
 
-# Update all collected information
-while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]];
-do
-  if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then
+# Functions to handle different actions
+handle_branch() {
+  local placeholder="$1"
+  echo "Replacing placeholder $placeholder with branch $current_branch"
+  /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' "$rd_manifest"
+}
+
+handle_hash() {
+  local placeholder="$1"
+  local url="$2"
+  local calculated_url=$(eval echo "$url")
+  local hash=$(curl -sL "$calculated_url" | sha256sum | cut -d ' ' -f1)
+  echo "Replacing placeholder $placeholder with hash $hash"
+  /bin/sed -i 's^'"$placeholder"'^'"$hash"'^g' "$rd_manifest"
+}
+
+handle_latestcommit() {
+  local placeholder="$1"
+  local url="$2"
+  local branch="$3"
+  local commit=$(git ls-remote "$url" "$branch" | cut -f1)
+  echo "Replacing placeholder $placeholder with latest commit $commit"
+  /bin/sed -i 's^'"$placeholder"'^'"$commit"'^g' "$rd_manifest"
+}
+
+handle_latestghtag() {
+  local placeholder="$1"
+  local url="$2"
+  local tag=$(git ls-remote --tags "$url" | tail -n 1 | cut -f2 | sed 's|refs/tags/||')
+  echo "Replacing placeholder $placeholder with latest tag $tag"
+  /bin/sed -i 's^'"$placeholder"'^'"$tag"'^g' "$rd_manifest"
+}
+
+handle_latestghrelease() {
+  local placeholder="$1"
+  local url="$2"
+  local suffix="$3"
+  echo "Fetching release data from: $url"
+  local release_data=$(curl -s "$url")
+  echo "Release data fetched."
+  local ghreleaseurl=$(echo "$release_data" | jq -r ".assets[] | select(.name | endswith(\"$suffix\")).browser_download_url")
+  
+  if [[ -z "$ghreleaseurl" ]]; then
+    echo "Error: No asset found with suffix $suffix"
+    exit 1
+  fi
+  
+  local ghreleasehash=$(curl -sL "$ghreleaseurl" | sha256sum | cut -d ' ' -f1)
+  
+  echo "Replacing placeholder $placeholder with URL $ghreleaseurl and hash $ghreleasehash"
+  /bin/sed -i 's^'"$placeholder"'^'"$ghreleaseurl"'^g' "$rd_manifest"
+  /bin/sed -i 's^'"HASHFOR$placeholder"'^'"$ghreleasehash"'^g' "$rd_manifest"
+}
+
+handle_latestghreleasesha() {
+  local placeholder="$1"
+  local url="$2"
+  local suffix="$3"
+  echo "Fetching release data from: $url"
+  local release_data=$(curl -s "$url")
+  echo "Release data fetched."
+  local ghreleaseurl=$(echo "$release_data" | jq -r ".assets[] | select(.name | endswith(\"$suffix\")).browser_download_url")
+  
+  if [[ -z "$ghreleaseurl" ]]; then
+    echo "Error: No asset found with suffix $suffix"
+    exit 1
+  fi
+  
+  local ghreleasehash=$(curl -sL "$ghreleaseurl" | sha256sum | cut -d ' ' -f1)
+  
+  echo "Replacing placeholder $placeholder with hash $ghreleasehash"
+  /bin/sed -i 's^'"$placeholder"'^'"$ghreleasehash"'^g' "$rd_manifest"
+}
+
+handle_outside_file() {
+  local placeholder="$1"
+  local file_path="$2"
+  if [[ "$file_path" == \$* ]]; then
+    eval file_path="$file_path"
+  fi
+  local content=$(cat "$file_path")
+  echo "Replacing placeholder $placeholder with content of file $file_path"
+  /bin/sed -i 's^'"$placeholder"'^'"$content"'^g' "$rd_manifest"
+}
+
+handle_outside_env_var() {
+  local placeholder="$1"
+  local var_name="$2"
+  if [[ "$var_name" == \$* ]]; then
+    eval var_name="$var_name"
+  fi
+  local value=$(echo "$var_name")
+  echo "Replacing placeholder $placeholder with environment variable $value"
+  /bin/sed -i 's^'"$placeholder"'^'"$value"'^g' "$rd_manifest"
+}
+
+handle_custom_command() {
+  local command="$1"
+  echo "Executing custom command: $command"
+  eval "$command"
+}
+
+handle_url() {
+  local placeholder="$1"
+  local url="$2"
+  local calculated_url=$(eval echo "$url")
+  echo "Replacing placeholder $placeholder with calculated URL $calculated_url"
+  /bin/sed -i 's^'"$placeholder"'^'"$calculated_url"'^g' "$rd_manifest"
+}
+
+# Process the task list
+while IFS="^" read -r action placeholder url branch || [[ -n "$action" ]]; do
+  if [[ ! "$action" == "#"* ]] && [[ -n "$action" ]]; then
     case "$action" in
-
-    "branch" )
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Current branch:" "$current_branch"
-      echo
-      /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' $rd_manifest
-    ;;
-
-    "hash" )
-      echo
-      echo "Placeholder text: $placeholder"
-      calculated_url=$(eval echo "$url")  # in case the url has to be calculated from an expression
-      echo "URL to hash: $calculated_url"
-      echo
-      hash=$(curl -sL "$calculated_url" | sha256sum | cut -d ' ' -f1)
-      echo "Hash found: $hash"
-      /bin/sed -i 's^'"$placeholder"'^'"$hash"'^' $rd_manifest
-    ;;
-
-    "latestcommit" )
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Repo to get latest commit from: $url branch: $branch"
-      echo
-      commit=$(git ls-remote "$url" "$branch" | cut -f1)
-      echo "Commit found: $commit"
-      /bin/sed -i 's^'"$placeholder"'^'"$commit"'^' $rd_manifest
-    ;;
-
-    "latestghtag" )
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Repo to get the latest tag from: $url"
-      echo
-      tag=$(git ls-remote "$url" | tail -n 1 | cut -f2 | sed 's|refs/tags/||')
-      echo "Tag found: $tag"
-      /bin/sed -i 's^'"$placeholder"'^'"$tag"'^' $rd_manifest
-    ;;
-
-    "latestghrelease" )
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Repo to look for latest releases: $url"
-      echo
-      ghreleaseurl=$(curl -s "$url" | grep browser_download_url | grep "$branch\""$ | cut -d : -f 2,3 | tr -d \" | sed -n 1p | tr -d ' ')
-      echo "GitHub release URL found: $ghreleaseurl"
-      /bin/sed -i 's^'"$placeholder"'^'"$ghreleaseurl"'^' $rd_manifest
-      ghreleasehash=$(curl -sL "$ghreleaseurl" | sha256sum | cut -d ' ' -f1)
-      echo "GitHub release hash found: $ghreleasehash"
-      /bin/sed -i 's^'"HASHFOR$placeholder"'^'"$ghreleasehash"'^' $rd_manifest
-    ;;
-
-    "outside_file" )
-      if [[ "$url" = \$* ]]; then # If value is a reference to a variable name
-        eval url="$url"
-      fi
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Information being injected: $(cat $url)"
-      echo
-      /bin/sed -i 's^'"$placeholder"'^'"$(cat $url)"'^' $rd_manifest
-    ;;
-
-    "outside_env_var" )
-      if [[ "$url" = \$* ]]; then # If value is a reference to a variable name
-        eval url="$url"
-      fi
-      echo
-      echo "Placeholder text: $placeholder"
-      echo "Information being injected: $(echo $url)"
-      echo
-      /bin/sed -i 's^'"$placeholder"'^'"$(echo $url)"'^' $rd_manifest
-    ;;
-
-    "custom_command" )
-      echo
-      echo "Command to run: $url"
-      echo
-      eval "$url"
-    ;;
-
-    "url" )
-      # this is used to calculate a dynamic url
-      echo
-      echo "Placeholder text: $placeholder"
-      calculated_url=$(eval echo "$url")
-      echo "Information being injected: $calculated_url"
-      echo
-      /bin/sed -i 's^'"$placeholder"'^'"$calculated_url"'^' $rd_manifest
-    ;;
-
+      "branch" ) handle_branch "$placeholder" ;;
+      "hash" ) handle_hash "$placeholder" "$url" ;;
+      "latestcommit" ) handle_latestcommit "$placeholder" "$url" "$branch" ;;
+      "latestghtag" ) handle_latestghtag "$placeholder" "$url" ;;
+      "latestghrelease" ) handle_latestghrelease "$placeholder" "$url" "$branch" ;;
+      "latestghreleasesha" ) handle_latestghreleasesha "$placeholder" "$url" "$branch" ;;
+      "outside_file" ) handle_outside_file "$placeholder" "$url" ;;
+      "outside_env_var" ) handle_outside_env_var "$placeholder" "$url" ;;
+      "custom_command" ) handle_custom_command "$url" ;;
+      "url" ) handle_url "$placeholder" "$url" ;;
     esac
   fi
 done < "$automation_task_list"