Merge branch 'cooker' into feat/godot-configurator

On branch feat/godot-configurator All conflicts fixed but you are still merging. Changes to be committed: modified: automation_tools/automation_task_list.cfg modified: functions/checks.sh modified: functions/global.sh modified: net.retrodeck.retrodeck.yml modified: retrodeck.sh modified: tools/configurator.sh
2025-01-17 22:35:39 +00:00 · 2024-08-06 17:00:54 +01:00 · 2024-08-06 17:00:54 +01:00 · d5ab7fc481
parent 7a3e7d9022 3a1cbd74ac
commit d5ab7fc481
6 changed files with 14 additions and 12 deletions
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@ -15,6 +15,7 @@ hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/release
 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^RETRODECKESDELATEST^https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
 hash^RETRODECKPPSSPPLATEST^https://github.com/RetroDECK/org.ppsspp.PPSSPP/releases/latest/download/RetroDECK-PPSSPP-Artifact.tar.gz
 hash^RETRODECKDOLPHINLATEST^https://github.com/RetroDECK/org.DolphinEmu.dolphin-emu/releases/latest/download/RetroDECK-dolphin-Artifact.tar.gz
 hash^RETRODECKPRIMEHACKLATEST^https://github.com/RetroDECK/io.github.shiiion.primehack/releases/latest/download/RetroDECK-primehack-Artifact.tar.gz
--- a/functions/checks.sh
+++ b/functions/checks.sh
@ -44,10 +44,10 @@ check_for_version_update() {

  log d "Entering funtcion check_for_version_update"

-  wget -q --spider "https://api.github.com/repos/XargonWan/$update_repo/releases/latest"
+  wget -q --spider "https://api.github.com/repos/$git_organization_name/$update_repo/releases/latest"

  if [ $? -eq 0 ]; then
-    local online_version=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+    local online_version=$(curl --silent "https://api.github.com/repos/$git_organization_name/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')

    if [[ ! "$update_ignore" == "$online_version" ]]; then
      if [[ "$update_repo" == "RetroDECK" ]] && [[ $(sed -e 's/[\.a-z]//g' <<< $version) -le $(sed -e 's/[\.a-z]//g' <<< $online_version) ]]; then
@ -83,7 +83,7 @@ check_for_version_update() {
          log i "Selected: \"OK\""
          set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks
        fi
-      elif [[ "$update_repo" == "RetroDECK-cooker" ]] && [[ ! $version == $online_version ]]; then
+      elif [[ "$update_repo" == "$cooker_repository_name" ]] && [[ ! $version == $online_version ]]; then
        log i "Showing update request dialog as \"$online_version\" was found and is greater then \"$version\""
        choice=$(rd_zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \
          --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--- a/functions/global.sh
+++ b/functions/global.sh
@ -53,6 +53,9 @@ RA_API_URL="https://retroachievements.org/dorequest.php"
 presets_dir="$config/retrodeck/presets"                                                                  # Repository for all system preset config files
 incompatible_presets_reference_list="$config/retrodeck/reference_lists/incompatible_presets.cfg"         # A config file listing all incompatible presets for reference (eg. cannot have borders and widescreen enabled simultaniously)
 pretty_system_names_reference_list="$config/retrodeck/reference_lists/pretty_system_names.cfg"           # An internal translation list for turning internal names (eg. gbc) to "pretty" names (Nintendo GameBoy Color)
+git_organization_name="RetroDECK"                                                                       # The name of the organization in our git repository such as GitHub
+cooker_repository_name="Cooker"                                                                         # The name of the cooker repository under RetroDECK organization
+

 # Godot data transfer temp files

@ -180,7 +183,7 @@ if [[ ! -f "$rd_conf" ]]; then
  set_setting_value $rd_conf "sdcard" "$default_sd" retrodeck "paths" # Set SD card location if default path has changed

  if grep -qF "cooker" <<< "$hard_version" || grep -qF "PR-" <<< "$hard_version"; then # If newly-installed version is a "cooker" or PR build
-    set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
+    set_setting_value $rd_conf "update_repo" "$cooker_repository_name" retrodeck "options"
    set_setting_value $rd_conf "update_check" "true" retrodeck "options"
    set_setting_value $rd_conf "developer_options" "true" retrodeck "options"
  fi
@ -197,7 +200,7 @@ else
  log i "Loading it"

  if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
-    set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
+    set_setting_value $rd_conf "update_repo" "$cooker_repository_name" retrodeck "options"
    set_setting_value $rd_conf "update_check" "true" retrodeck "options"
    set_setting_value $rd_conf "developer_options" "true" retrodeck "options"
  fi
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@ -530,10 +530,8 @@ modules:
      - chmod +x "${FLATPAK_DEST}/bin/"*
    sources:
      - type: archive
-        #url: RETRODECKESDEURLPLACEHOLDER
-        #sha256: RETRODECKESDEPLACEHOLDER
-        url: https://github.com/RetroDECK/ES-DE/releases/download/feat%2Fsmaller-menu-050824.03/RetroDECK-ES-DE-Artifact.tar.gz
-        sha256: 0a89329e5a7e9743c21606fbf0f7d44a3244accf2985ab99ff6db29b212b98f6
+        url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
+        sha256: RETRODECKESDELATEST

  - name: retrodeck-theme
    buildsystem: simple
@ -553,7 +551,7 @@ modules:
          missing_libs=$(find "${FLATPAK_DEST}/bin" -type f -exec ldd {} + 2>/dev/null | grep "not found" | awk '{print $1}' | sort | uniq)
          
          # for some reason these libraries are not recognized as missing so we mantain this list
-          manually_imported="libpostproc.so.56 libswscale.so.6 libshaderc_shared.so.1"
+          manually_imported="libpostproc.so.56 libswscale.so.6 libshaderc_shared.so.1 libbz2.so.1.0 libaio.so.1"

          missing_libs="$missing_libs $manually_imported"

--- a/retrodeck.sh
+++ b/retrodeck.sh
@ -109,7 +109,7 @@ if [ -f "$lockfile" ]; then
    if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
      log d "Newly-installed version is a \"cooker\" build"
      configurator_generic_dialog "RetroDECK Cooker Warning" "RUNNING COOKER VERSIONS OF RETRODECK CAN BE EXTREMELY DANGEROUS AND ALL OF YOUR RETRODECK DATA\n(INCLUDING BIOS FILES, BORDERS, DOWNLOADED MEDIA, GAMELISTS, MODS, ROMS, SAVES, STATES, SCREENSHOTS, TEXTURE PACKS AND THEMES)\nARE AT RISK BY CONTINUING!"
-      set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
+      set_setting_value $rd_conf "update_repo" "$cooker_repository_name" retrodeck "options"
      set_setting_value $rd_conf "update_check" "true" retrodeck "options"
      set_setting_value $rd_conf "developer_options" "true" retrodeck "options"
      cooker_base_version=$(echo $hard_version | cut -d'-' -f2)
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@ -1367,7 +1367,7 @@ configurator_online_update_channel_dialog() {

    if [ $? == 0 ] # User clicked "Yes"
    then
-      set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
+      set_setting_value $rd_conf "update_repo" "$cooker_repository_name" retrodeck "options"
    else # User clicked "Cancel"
      configurator_developer_dialog
    fi