From 0dfb7845b611849303cae648cacf8cd792f8a712 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 14 Apr 2024 21:19:38 +0900 Subject: [PATCH 01/16] RetroDECK v0.8.0b --- net.retrodeck.retrodeck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 62bb93b1..697b1267 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -72,8 +72,8 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" - # [ ] Update the appdata.xml with the version number and notes + # [x] Update the VERSION variable on line containing "VERSION=THISBRANCH" + # [x] Update the appdata.xml with the version number and notes # - name: version-initialization buildsystem: simple @@ -82,7 +82,7 @@ modules: # on main please update this with the version variable, eg: VERSION='0.7.4b' # on cooker will be THISBRANCH - VERSION=THISBRANCH + VERSION='0.8.0b' git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From 6d11d0cff7120b09769beff3798a2c4ae352c2c2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 14 Apr 2024 21:21:59 +0900 Subject: [PATCH 02/16] RetroDECK v0.8.0b --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 697b1267..1a4593a3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -80,9 +80,9 @@ modules: build-commands: - | - # on main please update this with the version variable, eg: VERSION='0.7.4b' + # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION='0.8.0b' + VERSION=0.8.0b git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From 812cd74160e3ff31b42128157e16ee79864767fc Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Sun, 14 Apr 2024 14:15:02 -0300 Subject: [PATCH 03/16] Fix typo in retrodeck.net --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 3b90e942..8c456636 100644 --- a/docs/index.html +++ b/docs/index.html @@ -190,8 +190,8 @@

The new controller friendly configurator with even more advanced tools.

-

Add seperate games to Steam

-

Tools for adding all your favorite games as seperate entries in Steam with the click of a button.

+

Add separate games to Steam

+

Tools for adding all your favorite games as separate entries in Steam with the click of a button.

More Content

From 830cc845b987e7f0b2243605ce990cc40c71b3fa Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 15 Apr 2024 10:41:04 +0900 Subject: [PATCH 04/16] ES-DE: updating branch [skip ci] --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 1a4593a3..6a9ef28f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -431,7 +431,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK-ES-DE - branch: update/3.1 + branch: retrodeck-main - type: shell # ES-DE - END From d8a182259505203ad80c718c4f86b66cac2c7c33 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 17 Apr 2024 10:04:47 +0900 Subject: [PATCH 05/16] WORKFLOW: moved away removed workflows for gitea compatibility [skip ci] --- .../removed => old/removed-workflows}/TEST_release_info.yml | 0 {.github/workflows/removed => old/removed-workflows}/cooker.yml | 0 .../removed => old/removed-workflows}/flathub_push_cooker.yml | 0 {.github/workflows/removed => old/removed-workflows}/main.yml | 0 .../removed => old/removed-workflows}/remove-artifacts.yml | 0 .../removed => old/removed-workflows}/update-readthedocs.yml | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {.github/workflows/removed => old/removed-workflows}/TEST_release_info.yml (100%) rename {.github/workflows/removed => old/removed-workflows}/cooker.yml (100%) rename {.github/workflows/removed => old/removed-workflows}/flathub_push_cooker.yml (100%) rename {.github/workflows/removed => old/removed-workflows}/main.yml (100%) rename {.github/workflows/removed => old/removed-workflows}/remove-artifacts.yml (100%) rename {.github/workflows/removed => old/removed-workflows}/update-readthedocs.yml (100%) diff --git a/.github/workflows/removed/TEST_release_info.yml b/old/removed-workflows/TEST_release_info.yml similarity index 100% rename from .github/workflows/removed/TEST_release_info.yml rename to old/removed-workflows/TEST_release_info.yml diff --git a/.github/workflows/removed/cooker.yml b/old/removed-workflows/cooker.yml similarity index 100% rename from .github/workflows/removed/cooker.yml rename to old/removed-workflows/cooker.yml diff --git a/.github/workflows/removed/flathub_push_cooker.yml b/old/removed-workflows/flathub_push_cooker.yml similarity index 100% rename from .github/workflows/removed/flathub_push_cooker.yml rename to old/removed-workflows/flathub_push_cooker.yml diff --git a/.github/workflows/removed/main.yml b/old/removed-workflows/main.yml similarity index 100% rename from .github/workflows/removed/main.yml rename to old/removed-workflows/main.yml diff --git a/.github/workflows/removed/remove-artifacts.yml b/old/removed-workflows/remove-artifacts.yml similarity index 100% rename from .github/workflows/removed/remove-artifacts.yml rename to old/removed-workflows/remove-artifacts.yml diff --git a/.github/workflows/removed/update-readthedocs.yml b/old/removed-workflows/update-readthedocs.yml similarity index 100% rename from .github/workflows/removed/update-readthedocs.yml rename to old/removed-workflows/update-readthedocs.yml From 4f16597f81a02c101a49a08f979ca939abb73035 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 17 Apr 2024 10:23:50 +0900 Subject: [PATCH 06/16] WORKFLOW: added placeholder to publish on gitea --- .github/workflows/main-selfhosted.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 2618d7ba..97a74053 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -122,3 +122,28 @@ jobs: name: retrodeck-flatpak path: RetroDECK.flatpak continue-on-error: true + + # - name: Publish the flatpak in a new release on Gitea + # uses: ncipollo/release-action@v1 + # env: + # REL_VER: ${{ env.REL_VER }} + # with: + # tag: ${{ env.REL_VER }} + # name: "RetroDECK v${{ env.REL_VER }}" + # bodyFile: "body.md" + # artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" + # allowUpdates: true + # makeLatest: true + # token: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} # Replace with your Gitea token secret + # repo: "organization/repo" # Replace with your Gitea repository path + # continue-on-error: true + + # - name: Upload RetroDECK.flatpak to Gitea Release + # run: | + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -F "file=@RetroDECK.flatpak" \ + # "https://gitea.example.com/api/v1/repos/organization/repo/releases/${{ env.REL_VER }}/assets?name=RetroDECK.flatpak" + # env: + # GITEA_TOKEN: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} # Replace with your Gitea token secret + From 27037522f7870edd80c57317508539a8798e600c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 17 Apr 2024 11:07:08 +0900 Subject: [PATCH 07/16] WORKFLOW: added steps to publish main on gitea [skip ci] --- .github/workflows/main-selfhosted.yml | 44 +++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 97a74053..bd335618 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -123,27 +123,27 @@ jobs: path: RetroDECK.flatpak continue-on-error: true - # - name: Publish the flatpak in a new release on Gitea - # uses: ncipollo/release-action@v1 - # env: - # REL_VER: ${{ env.REL_VER }} - # with: - # tag: ${{ env.REL_VER }} - # name: "RetroDECK v${{ env.REL_VER }}" - # bodyFile: "body.md" - # artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" - # allowUpdates: true - # makeLatest: true - # token: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} # Replace with your Gitea token secret - # repo: "organization/repo" # Replace with your Gitea repository path - # continue-on-error: true + - name: Publish the flatpak in a new release on Gitea + uses: ncipollo/release-action@v1 + env: + REL_VER: ${{ env.REL_VER }} + with: + tag: ${{ env.REL_VER }} + name: "RetroDECK v${{ env.REL_VER }}" + bodyFile: "body.md" + artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" + allowUpdates: true + makeLatest: true + token: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} + repo: "https://repo.retrodeck.net/RetroDECK/RetroDECK" + continue-on-error: true - # - name: Upload RetroDECK.flatpak to Gitea Release - # run: | - # curl -X POST \ - # -H "Authorization: token ${GITEA_TOKEN}" \ - # -F "file=@RetroDECK.flatpak" \ - # "https://gitea.example.com/api/v1/repos/organization/repo/releases/${{ env.REL_VER }}/assets?name=RetroDECK.flatpak" - # env: - # GITEA_TOKEN: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} # Replace with your Gitea token secret + - name: Upload RetroDECK.flatpak to Gitea Release + run: | + curl -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -F "file=@RetroDECK.flatpak" \ + "https://repo.retrodeck.net/RetroDECK/RetroDECK/releases/${{ env.REL_VER }}/assets?name=RetroDECK.flatpak" + env: + GITEA_TOKEN: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} From e58f09bf0538343c7c405f9d791732f158ed7469 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 18 Apr 2024 08:56:09 +0900 Subject: [PATCH 08/16] Updated Discord invite link [skip ci] --- README.md | 6 +++--- net.retrodeck.retrodeck.appdata.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4e90fe3b..6a4f59d3 100644 --- a/README.md +++ b/README.md @@ -74,11 +74,11 @@ For our long term vision you can check out the following wiki page: [RetroDECK: Visions and Goals](https://retrodeck.readthedocs.io/en/latest/wiki_about/visions-and-goals/) ### How to get support? -Use the supports channels on [Discord](https://discord.gg/Dz3szYsP8g) `🤝-community-support` and `🆘-support`. +Use the supports channels on [Discord](https://discord.gg/WDc5C9YWMx) `🤝-community-support` and `🆘-support`. ### The RetroDECK community: [Website](https://retrodeck.net)
[Wiki](https://github.com/XargonWan/RetroDECK/wiki)
-[Discord](https://discord.gg/Dz3szYsP8g)
+[Discord](https://discord.gg/WDc5C9YWMx)
[Lemmy](https://lemmy.zip/c/retrodeck)
[Subreddit](https://www.reddit.com/r/retrodeck) @@ -113,4 +113,4 @@ Please check out the [Wiki](https://github.com/XargonWan/RetroDECK/wiki) for eve The RetroDECK [FAQ](https://github.com/XargonWan/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and awnsers. # How to get support? -Use the supports channels on [Discord](https://discord.gg/Dz3szYsP8g). +Use the supports channels on [Discord](https://discord.gg/WDc5C9YWMx). diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 9f24e3b2..40ce91dc 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -57,7 +57,7 @@ https://www.patreon.com/RetroDECK

If you want to join the RetroDECK community check our:

Reddit: https://www.reddit.com/r/RetroDECK/

-

Discord: https://discord.gg/Dz3szYsP8g +

Discord: https://discord.gg/WDc5C9YWMx (If you want to help out with the project join the "i-want-to-help" channel)

GPL-3.0 From c4b3dc708f490e3e26f8b971c733cf3cc9a5dcb8 Mon Sep 17 00:00:00 2001 From: sylviekai <165470978+sylviekai@users.noreply.github.com> Date: Thu, 18 Apr 2024 04:13:01 +0000 Subject: [PATCH 09/16] Update net.retrodeck.retrodeck.appdata.xml to use branding tag Based on color in T of logo, #6c7df5, going three shades darker and three shades lighter --- net.retrodeck.retrodeck.appdata.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 40ce91dc..0a09ca35 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -60,6 +60,10 @@

Discord: https://discord.gg/WDc5C9YWMx (If you want to help out with the project join the "i-want-to-help" channel)

+ + #94a6fb + #404b98 + GPL-3.0 CC0-1.0 From 3896af655ffb5a2adb5f52e26bf4c010c3aa9ac5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 18 Apr 2024 16:36:22 +0900 Subject: [PATCH 10/16] 0.8.1b init [skip ci] --- net.retrodeck.retrodeck.appdata.xml | 13 +++++++++++++ net.retrodeck.retrodeck.yml | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 40ce91dc..593473bb 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -63,6 +63,19 @@ GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.1b + +

Changes:

+
    +
  • PLACEHOLDER
    • +
+

Known issues:

+
    +
  • Please check the know issues in the Wiki under General Infomration.
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.0b diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2c04d96b..2b2cdf04 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -69,7 +69,7 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [x] Update the VERSION variable on line containing "VERSION=THISBRANCH" + # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" # [x] Update the appdata.xml with the version number and notes # - name: version-initialization @@ -79,7 +79,7 @@ modules: # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION=0.8.0b + VERSION=THISBRANCH git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From adac400f09849dec5add7069c0be02030852a0c0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 19 Apr 2024 11:17:16 +0900 Subject: [PATCH 11/16] RESET_COMPONENT: lowercasing and simplifying the code --- functions/prepare_component.sh | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index a47e5fd2..da229d6b 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -10,7 +10,7 @@ prepare_component() { # USAGE: prepare_component "$action" "$component" "$call_source(optional)" action="$1" - component="$2" + component=$(echo "$2" | tr '[:upper:]' '[:lower:]') call_source="$3" log d "Preparing component: \"$component\", action: \"$action\"" @@ -48,7 +48,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset + if [[ "$component" =~ ^(es-de|all)$ ]]; then # For use after ESDE-related folders are moved or a reset log i "--------------------------------" log i "Prepearing ES-DE" log i "--------------------------------" @@ -75,7 +75,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(retroarch|RetroArch|all)$ ]]; then + if [[ "$component" =~ ^(retroarch|all)$ ]]; then log i "--------------------------------" log i "Prepearing RetroArch" log i "--------------------------------" @@ -202,7 +202,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(citra|citra-emu|Citra|all)$ ]]; then + if [[ "$component" =~ ^(citra|citra-emu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing CITRA" @@ -247,7 +247,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(cemu|Cemu|all)$ ]]; then + if [[ "$component" =~ ^(cemu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing CEMU" @@ -274,7 +274,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(dolphin|dolphin-emu|Dolphin|all)$ ]]; then + if [[ "$component" =~ ^(dolphin|dolphin-emu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing DOLPHIN" @@ -327,7 +327,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(duckstation|Duckstation|all)$ ]]; then + if [[ "$component" =~ ^(duckstation|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing DUCKSTATION" @@ -372,7 +372,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(melonds|melonDS|MelonDS|all)$ ]]; then + if [[ "$component" =~ ^(melonds|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing MELONDS" @@ -410,7 +410,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(pcsx2|PCSX2|all)$ ]]; then + if [[ "$component" =~ ^(pcsx2|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing PCSX2" @@ -464,7 +464,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(ppsspp|PPSSPP|all)$ ]]; then + if [[ "$component" =~ ^(ppsspp|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing PPSSPPSDL" @@ -492,7 +492,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(primehack|Primehack|all)$ ]]; then + if [[ "$component" =~ ^(primehack|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing Primehack" @@ -535,7 +535,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(rpcs3|RPCS3|all)$ ]]; then + if [[ "$component" =~ ^(rpcs3|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing RPCS3" @@ -571,7 +571,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(ryujinx|Ryujinx|all)$ ]]; then + if [[ "$component" =~ ^(ryujinx|all)$ ]]; then # NOTE: for techincal reasons the system folder of Ryujinx IS NOT a sumlink of the bios/switch/keys as not only the keys are located there # When RetroDECK starts there is a "manage_ryujinx_keys" function that symlinks the keys only in Rryujinx/system. if [[ "$action" == "reset" ]]; then # Run reset-only commands @@ -615,7 +615,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(yuzu|Yuzu|all)$ ]]; then + if [[ "$component" =~ ^(yuzu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing YUZU" @@ -668,7 +668,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(xemu|XEMU|all)$ ]]; then + if [[ "$component" =~ ^(xemu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing XEMU" @@ -712,7 +712,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(vita3k|Vita3K|all)$ ]]; then + if [[ "$component" =~ ^(vita3k|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing Vita3K" @@ -736,7 +736,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(mame|MAME|all)$ ]]; then + if [[ "$component" =~ ^(mame|all)$ ]]; then # TODO: do a proper script # This is just a placeholder script to test the emulator's flow log i "----------------------" @@ -801,7 +801,7 @@ prepare_component() { fi - if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then + if [[ "$component" =~ ^(gzdoom|all)$ ]]; then # TODO: do a proper script # This is just a placeholder script to test the emulator's flow log i "----------------------" @@ -821,7 +821,7 @@ prepare_component() { sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON fi - if [[ "$component" =~ ^(boilr|BOILR|all)$ ]]; then + if [[ "$component" =~ ^(boilr|all)$ ]]; then log i "----------------------" log i "Prepearing BOILR" log i "----------------------" @@ -830,7 +830,7 @@ prepare_component() { cp -fvr "/app/libexec/steam-sync/config.toml" "/var/config/boilr" fi - if [[ ! "$component" =~ ^(retrodeck|es-de|ES-DE|retroarch|RetroArch|citra|citra-emu|Citra|cemu|Cemu|dolphin|dolphin-emu|Dolphin|duckstation|Duckstation|melonds|melonDS|MelonDS|pcsx2|PCSX2|pico8|pico-8|ppsspp|PPSSPP|primehack|Primehack|rpcs3|RPCS3|ryujinx|Ryujinx|yuzu|Yuzu|xemu|XEMU|vita3k|Vita3K|mame|MAME|gzdoom|GZDOOM|boilr|BOILR|)$ ]]; then + if [[ ! "$component" =~ ^(retrodeck|es-de|retroarch|citra|citra-emu|cemu|dolphin|dolphin-emu|duckstation|melonds|melonDS|pcsx2|pico8|pico-8|ppsspp|primehack|rpcs3|ryujinx|yuzu|xemu|vita3k|mame|gzdoom|boilr|)$ ]]; then log e "Supplied component $component not found, not resetting" fi From c7abe3ea9f47aa8634a2900459d58da98529bee5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 19 Apr 2024 11:26:12 +0900 Subject: [PATCH 12/16] RESET_COMPONENT: lowercasing and simplifying the code, even in the cli --- retrodeck.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/retrodeck.sh b/retrodeck.sh index bdfdae05..03974e92 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -58,6 +58,7 @@ https://retrodeck.net echo "You are about to reset one or more RetroDECK components or emulators." echo "Available options are: es-de, retroarch, cemu, dolphin, duckstation, gzdoom, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, ryujinx, xemu, vita3k, mame, boilr, all" read -p "Please enter the component you would like to reset: " component + component=$(echo "$component" | tr '[:upper:]' '[:lower:]') if [[ "$component" =~ ^(es-de|retroarch|cemu|dolphin|duckstation|gzdoom|mame|melonds|pcsx2|ppsspp|primehack|ryujinx|rpcs3|xemu|all)$ ]]; then read -p "You are about to reset $component to default settings. Enter 'y' to continue, 'n' to stop: " response if [[ $response == [yY] ]]; then From c1c0491a66e664cb850aa4a997809617b8ecc4e9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 19 Apr 2024 11:48:36 +0900 Subject: [PATCH 13/16] ES-DE: migrating collections and games list in a new structure --- functions/post_update.sh | 8 ++++++++ functions/prepare_component.sh | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index b3030442..fb7120e2 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -300,6 +300,14 @@ post_update() { fi + if [[ $(check_version_is_older_than "0.8.1b") == "true" ]]; then + log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure" + dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections" + dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists" + mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists" + rm -rf "$rdhome/gamelists" + fi + # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then # # Placeholder for version 0.9.0b # rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index da229d6b..26b8c483 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -60,7 +60,8 @@ prepare_component() { set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" + dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists" + dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections" dir_prep "$rd_logs_folder/ES-DE" "$es_source_logs" log d "Generating roms system folders" #es-de --home /var/config/ES-DE --create-system-dirs From 28846a89cb0a2234c3fa0831236bcd8fcf2a0be1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 19 Apr 2024 15:01:55 +0900 Subject: [PATCH 14/16] CHANGELOG: removing version notes from the terminal output [skip ci] --- functions/dialogs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/functions/dialogs.sh b/functions/dialogs.sh index c0789042..4e611251 100644 --- a/functions/dialogs.sh +++ b/functions/dialogs.sh @@ -175,8 +175,7 @@ changelog_dialog() { else local version_changelog=$(xml sel -t -m "//release[@version='$1']/description" -v . -n $rd_appdata | tr -s '\n' | sed 's/^\s*//') - echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" - "$version_changelog" >> "/var/config/retrodeck/changelog-partial.txt" + echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" 2>/dev/null zenity --icon-name=net.retrodeck.retrodeck --text-info --width=1200 --height=720 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ From 9aef952524b007079ae57444e5ae7094a53de975 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 19 Apr 2024 16:41:22 +0900 Subject: [PATCH 15/16] WORKFLOWS: moved on disabled folder the ones we'renot using (do not delete, might be useful later on) [skip ci] --- .../TEST_release_info.yml | 0 .../workflows => old/disabled-workflows}/cooker-selfhosted.yml | 0 old/{removed-workflows => disabled-workflows}/cooker.yml | 0 .../flathub_push_cooker.yml | 0 old/{removed-workflows => disabled-workflows}/main.yml | 0 .../remove-artifacts.yml | 0 .../workflows => old/disabled-workflows}/submodule-update.yml | 0 .../update-readthedocs.yml | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename old/{removed-workflows => disabled-workflows}/TEST_release_info.yml (100%) rename {.github/workflows => old/disabled-workflows}/cooker-selfhosted.yml (100%) rename old/{removed-workflows => disabled-workflows}/cooker.yml (100%) rename old/{removed-workflows => disabled-workflows}/flathub_push_cooker.yml (100%) rename old/{removed-workflows => disabled-workflows}/main.yml (100%) rename old/{removed-workflows => disabled-workflows}/remove-artifacts.yml (100%) rename {.github/workflows => old/disabled-workflows}/submodule-update.yml (100%) rename old/{removed-workflows => disabled-workflows}/update-readthedocs.yml (100%) diff --git a/old/removed-workflows/TEST_release_info.yml b/old/disabled-workflows/TEST_release_info.yml similarity index 100% rename from old/removed-workflows/TEST_release_info.yml rename to old/disabled-workflows/TEST_release_info.yml diff --git a/.github/workflows/cooker-selfhosted.yml b/old/disabled-workflows/cooker-selfhosted.yml similarity index 100% rename from .github/workflows/cooker-selfhosted.yml rename to old/disabled-workflows/cooker-selfhosted.yml diff --git a/old/removed-workflows/cooker.yml b/old/disabled-workflows/cooker.yml similarity index 100% rename from old/removed-workflows/cooker.yml rename to old/disabled-workflows/cooker.yml diff --git a/old/removed-workflows/flathub_push_cooker.yml b/old/disabled-workflows/flathub_push_cooker.yml similarity index 100% rename from old/removed-workflows/flathub_push_cooker.yml rename to old/disabled-workflows/flathub_push_cooker.yml diff --git a/old/removed-workflows/main.yml b/old/disabled-workflows/main.yml similarity index 100% rename from old/removed-workflows/main.yml rename to old/disabled-workflows/main.yml diff --git a/old/removed-workflows/remove-artifacts.yml b/old/disabled-workflows/remove-artifacts.yml similarity index 100% rename from old/removed-workflows/remove-artifacts.yml rename to old/disabled-workflows/remove-artifacts.yml diff --git a/.github/workflows/submodule-update.yml b/old/disabled-workflows/submodule-update.yml similarity index 100% rename from .github/workflows/submodule-update.yml rename to old/disabled-workflows/submodule-update.yml diff --git a/old/removed-workflows/update-readthedocs.yml b/old/disabled-workflows/update-readthedocs.yml similarity index 100% rename from old/removed-workflows/update-readthedocs.yml rename to old/disabled-workflows/update-readthedocs.yml From 3e8fd710caaab0e3a8d0ac78067af426e150d2b7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 20 Apr 2024 08:56:20 +0900 Subject: [PATCH 16/16] WORKFLOW: re-enabled remove-artifact (was a mistake) [skip ci] --- .../disabled-workflows => .github/workflows}/remove-artifacts.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {old/disabled-workflows => .github/workflows}/remove-artifacts.yml (100%) diff --git a/old/disabled-workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml similarity index 100% rename from old/disabled-workflows/remove-artifacts.yml rename to .github/workflows/remove-artifacts.yml