From 558d138b5c2d494998f465e18a59b755e6080a6f Mon Sep 17 00:00:00 2001 From: Lazorne Date: Wed, 26 Apr 2023 06:00:39 +0000 Subject: [PATCH 1/5] Update README.md RetroBat changed their website --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d425205..99b0742b 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ No, partitioning or formatting is not needed at all. RetroDECK (differently from ## Do you support Windows? No, RetroDECK doesn't support Windows, but the project is fully open source so you can port it if you wish. -As an alternative you could try [Retrobat](http://www.retrobat.ovh/) that offers similar functionality. +As an alternative you could try [Retrobat](https://www.retrobat.org/) that offers similar functionality. ## Do you support the Linux Desktop? We do plan to support Linux Desktop in the future. But during the BETA we are focusing on the Steam Deck. Technically it is working, but the user experience might not be that great (it could contain desktop specific bugs and other issues). If you want to try it make sure that your distribution has native flatpak support else, you might need to install it. From f6d596152e99bfa87c15103607bec965d3eba74d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 26 Apr 2023 16:26:10 +0200 Subject: [PATCH 2/5] RetroDECK v0.6.6b --- net.retrodeck.retrodeck.appdata.xml | 2 +- net.retrodeck.retrodeck.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 5dcddad5..f928a69d 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,7 +65,7 @@ GPL-3.0 CC0-1.0 - + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.6b

Bug fixes:

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 380d611d..01e22193 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,18 +66,18 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [ ] Update the VERSION variable - # [ ] Update the appdata.xml with the version number and notes - # [ ] change branch into main in version-initialization (first one) - # [ ] change branch into main in retrodeck module (last one) - # [ ] if header (before modules) was edited, edit it even in flathub.yml + # [X] Update the VERSION variable + # [X] Update the appdata.xml with the version number and notes + # [X] change branch into main in version-initialization (first one) + # [X] change branch into main in retrodeck module (last one) + # [X] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization buildsystem: simple build-commands: - | - VERSION="cooker-0.6.6b" + VERSION="0.6.6b" git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ @@ -90,7 +90,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.6.6b + branch: main - name: xmlstarlet config-opts: @@ -1109,4 +1109,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.6.6b \ No newline at end of file + branch: main \ No newline at end of file From 2bb1d7284af0848ddc4a1b6bfde7df13fc0a22f4 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 26 Apr 2023 15:18:06 -0400 Subject: [PATCH 3/5] Swanstation change was done at 0.6.6b --- post_update.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/post_update.sh b/post_update.sh index 525004fb..dd81372d 100644 --- a/post_update.sh +++ b/post_update.sh @@ -121,8 +121,6 @@ post_update() { rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" cp -f "$emuconfigs/retrodeck/defaults/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" fi - - configurator_generic_dialog "As part of this update, the default PSX emulator has changed!\n\nIf you are currently playing PSX games and have not changed the default emulator on your own, you will need to switch back to the previous default emulator (Swanstation) for your existing saves to work.\nIf you have changed the default emulator yourself, please change it again to your previous choice.\n\nSee the wiki or Discord if you have more questions on this change!" fi # The following commands are run every time. From 79598fb82bd0bbeef119de914e2ef2528465f219 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 26 Apr 2023 15:22:57 -0400 Subject: [PATCH 4/5] Remove unneeded note --- post_update.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/post_update.sh b/post_update.sh index dd81372d..d7f610b4 100644 --- a/post_update.sh +++ b/post_update.sh @@ -76,7 +76,6 @@ post_update() { # - Update RPCS3 vfs file contents. migrate from old location if needed # - Disable ESDE update checks for existing installs # - Offer user option of installing custom controller config - # - Notify user of default PSX core change mkdir -p "$mods_folder" mkdir -p "$texture_packs_folder" From e3ef8683579206d79a9a2e21549dcb9ecf8792fd Mon Sep 17 00:00:00 2001 From: icenine451 Date: Wed, 26 Apr 2023 17:02:44 -0400 Subject: [PATCH 5/5] Finally fix cooker update checker Improve finit handing of interruption Fix some paths not being created during finit --- functions.sh | 8 ++++++-- global.sh | 5 ++--- retrodeck.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index 01da5992..8acbe35b 100644 --- a/functions.sh +++ b/functions.sh @@ -1195,7 +1195,7 @@ prepare_emulator() { if [[ ! $current_setting_name =~ (rdhome|sdcard) ]]; then # Ignore these locations local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "paths") eval "$current_setting_name=$rdhome/$(basename $current_setting_value)" - mkdir "$rdhome/$(basename $current_setting_value)" + mkdir -p "$rdhome/$(basename $current_setting_value)" fi done < <(grep -v '^\s*$' $rd_conf | awk '/^\[paths\]/{f=1;next} /^\[/{f=0} f') fi @@ -1870,7 +1870,8 @@ finit() { case $finit_dest_choice in - "" ) # Cancel or X button quits + "Back" | "" ) # Back or X button quits + rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted echo "Now quitting" exit 2 ;; @@ -1895,6 +1896,7 @@ finit() { --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck folder will be created starting from the directory that you selected." rdhome=$(finit_browse) # Calling the browse function if [[ -z $rdhome ]]; then # If user hit the cancel button + rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted exit 2 fi elif [ ! -w "$sdcard" ] #SD card found but not writable @@ -1905,6 +1907,7 @@ finit() { --title "RetroDECK" \ --ok-label "Quit" \ --text="SD card was found but is not writable\nThis can happen with cards formatted on PC.\nPlease format the SD card through the Steam Deck's Game Mode and run RetroDECK again." + rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted echo "Now quitting" exit 2 else @@ -1921,6 +1924,7 @@ finit() { --text="Please choose the root folder for the RetroDECK data.\nA retrodeck folder will be created starting from the directory that you selected." rdhome=$(finit_browse) # Calling the browse function if [[ -z $rdhome ]]; then # If user hit the cancel button + rm -f "$rd_conf" # Cleanup unfinished retrodeck.cfg if first install is interrupted exit 2 fi ;; diff --git a/global.sh b/global.sh index ebd2fdd4..d557a526 100755 --- a/global.sh +++ b/global.sh @@ -97,8 +97,7 @@ then fi # If there is no config file I initalize the file with the the default values -if [ ! -f "$rd_conf" ] -then +if [[ ! -f "$rd_conf" ]]; then mkdir -p /var/config/retrodeck echo "RetroDECK config file not found in $rd_conf" echo "Initializing" @@ -126,7 +125,7 @@ then 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_check" "true" retrodeck "options" - update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up. fi diff --git a/retrodeck.sh b/retrodeck.sh index c7447ccb..f98312d8 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -106,7 +106,7 @@ then echo "Config file's version is $version but the actual version is $hard_version" if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build cooker_base_version=$(echo $hard_version | cut -d'-' -f2) - update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + update_ignore=$(curl --silent "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') set_setting_value $rd_conf "update_ignore" "$update_ignore" retrodeck "options" # Store the latest online version to ignore for future checks, as internal version and online tag version may not match up. choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Upgrade" --extra-button="Don't Upgrade" --extra-button="Fresh Install" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \