From 522615ae18cb904186e3a702a5a3740e6cd903b7 Mon Sep 17 00:00:00 2001
From: XargonWan
Date: Thu, 18 Apr 2024 08:54:32 +0900
Subject: [PATCH 1/4] Updated Discord invite link
---
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 7e272b95d3462576a37f69261d45b179cf9b3d10 Mon Sep 17 00:00:00 2001
From: XargonWan
Date: Thu, 18 Apr 2024 08:55:10 +0900
Subject: [PATCH 2/4] MAME: triggering build for chdman
From c3544b0b97bb9b7763741d0a739793cb478528df Mon Sep 17 00:00:00 2001
From: icenine451
Date: Tue, 23 Apr 2024 09:31:15 -0400
Subject: [PATCH 3/4] Remove excess log folder creation
---
functions/global.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/functions/global.sh b/functions/global.sh
index f37658e1..9975616b 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -138,7 +138,6 @@ fi
# If there is no config file I initalize the file with the the default values
if [[ ! -f "$rd_conf" ]]; then
- create_dir /var/config/retrodeck/logs
log w "RetroDECK config file not found in $rd_conf"
log i "Initializing"
# if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one
From 3f284472d4725717f42b0060b8464c57c20bc663 Mon Sep 17 00:00:00 2001
From: icenine451
Date: Tue, 23 Apr 2024 10:41:38 -0400
Subject: [PATCH 4/4] Add optional Ryujinx reset to 0.8.1b post_update
---
functions/post_update.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/functions/post_update.sh b/functions/post_update.sh
index 29abcee4..4ff0c964 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -301,11 +301,20 @@ post_update() {
fi
if [[ $(check_version_is_older_than "0.8.1b") == "true" ]]; then
+ log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:"
+ log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure"
+ log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b"
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"
+
+ log d "Verifying with user if they want to reset Ryujinx"
+ if [[ "$(configurator_generic_question_dialog "RetroDECK 0.8.1b Ryujinx Reset" "In RetroDECK 0.8.0b the Ryujinx emulator was not properly initialized for upgrading users.\nThis would cause Ryujinx to not work properly.\n\nWould you like to reset Ryujinx to default RetroDECK settings now?\n\nIf you have made your own changes to the Ryujinx config, you can decline this reset.")" == "true" ]]; then
+ log d "User agreed to Ryujinx reset"
+ prepare_component "reset" "ryujinx"
+ fi
fi
# if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; then