From 0cbbe5f99d5ffc231dc79b50a5ecdf733dbe8791 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 9 Dec 2022 09:35:39 -0500
Subject: [PATCH 1/3] More Ryujinx Configurator functions

---
 functions.sh          | 14 +++++++++-----
 tools/configurator.sh |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index 950466d7..670a4c86 100644
--- a/functions.sh
+++ b/functions.sh
@@ -661,7 +661,7 @@ ryujinx_init() {
   mkdir -p /var/config/Ryujinx/system
   cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx
   sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/Ryujinx/Config.json
-  ln -s $rdhome/bios/switch/keys /var/config/Ryujinx/system
+  dir_prep "$rdhome/bios/switch/keys" "/var/config/Ryujinx/system"
 }
 
 standalones_init() {
@@ -737,6 +737,10 @@ emulators_post_move() {
 
   # Duckstation section
   sed -i 's#/home/deck/retrodeck/bios#'$rdhome/bios'#g' /var/config/duckstation/settings.ini
+
+  # Ryujinx section
+  sed -i 's#/home/deck/retrodeck#'$rdhome'#g' /var/config/Ryujinx/Config.json
+  dir_prep "$rdhome/bios/switch/keys" "/var/config/Ryujinx/system"
 }
 
 #=========================
@@ -862,8 +866,8 @@ start_retrodeck() {
   emulationstation --home /var/config/emulationstation
 }
 
-old_browse() {
-# Function for browsing the sd card
+finit_browse() {
+# Function for choosing data directory location during first/forced init
 path_selected=false
 while [ $path_selected == false ]
 do
@@ -938,7 +942,7 @@ finit() {
       --title "RetroDECK" \
       --ok-label "Browse" \
       --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=$(old_browse) # Calling the browse function
+      rdhome=$(finit_browse) # Calling the browse function
       if [[ -z $rdhome ]]; then # If user hit the cancel button
         exit 2
       fi
@@ -976,7 +980,7 @@ finit() {
       --title "RetroDECK" \
       --ok-label "Browse" \
       --text="Please choose the root folder for the RetroDECK data.\nA retrodeck folder will be created starting from the directory that you selected."
-      rdhome=$(old_browse) # Calling the browse function
+      rdhome=$(finit_browse) # Calling the browse function
       if [[ -z $rdhome ]]; then # If user hit the cancel button
         exit 2
       fi
diff --git a/tools/configurator.sh b/tools/configurator.sh
index d12fc078..cfdd78e6 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -28,6 +28,7 @@ source /app/libexec/functions.sh # uncomment for flatpak testing
 #           - Reset PCSX2
 #           - Reset MelonDS
 #           - Reset Citra
+#           - Reset Ryujinx
 #           - Reset RPCS3
 #           - Reset XEMU
 #           - Reset PPSSPP
@@ -71,8 +72,8 @@ configurator_reset_dialog() {
     "MelonDS" \
     "PCSX2" \
     "PPSSPP" \
-    "RPCS3" \
     "Ryujinx" \
+    "RPCS3" \
     "XEMU" \
     "Yuzu")
 

From eef960a872b0d769a4eb8fc0f391c9fb7d66a750 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 9 Dec 2022 13:34:24 -0500
Subject: [PATCH 2/3] Add Ryujinx to power user options

---
 tools/configurator.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/configurator.sh b/tools/configurator.sh
index cfdd78e6..c7181883 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -217,6 +217,7 @@ configurator_power_user_changes_dialog() {
     "PCSX2-Legacy" \
     "PPSSPP" \
     "RPCS3" \
+    "Ryujinx" \
     "XEMU" \
     "Yuzu")
 
@@ -258,6 +259,10 @@ configurator_power_user_changes_dialog() {
       rpcs3
     ;;
 
+    "Ryujinx" )
+      ryujinx-wrapper
+    ;;
+
     "XEMU" )
       xemu
     ;;

From 87fd2f87cd98a03e6bd28e3f91a7a9d2207e78ba Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Fri, 9 Dec 2022 13:37:02 -0500
Subject: [PATCH 3/3] Alphabetize emulator listings

---
 tools/configurator.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/configurator.sh b/tools/configurator.sh
index c7181883..e851fa06 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -28,8 +28,8 @@ source /app/libexec/functions.sh # uncomment for flatpak testing
 #           - Reset PCSX2
 #           - Reset MelonDS
 #           - Reset Citra
-#           - Reset Ryujinx
 #           - Reset RPCS3
+#           - Reset Ryujinx
 #           - Reset XEMU
 #           - Reset PPSSPP
 #           - Reset Duckstation
@@ -72,8 +72,8 @@ configurator_reset_dialog() {
     "MelonDS" \
     "PCSX2" \
     "PPSSPP" \
-    "Ryujinx" \
     "RPCS3" \
+    "Ryujinx" \
     "XEMU" \
     "Yuzu")
 
@@ -114,13 +114,13 @@ configurator_reset_dialog() {
       configurator_process_complete_dialog "resetting $emulator_to_reset"
     ;;
 
-    "Ryujinx" )
-      ryujinx_init
+    "RPCS3" )
+      rpcs3_init
       configurator_process_complete_dialog "resetting $emulator_to_reset"
     ;;
 
-    "RPCS3" )
-      rpcs3_init
+    "Ryujinx" )
+      ryujinx_init
       configurator_process_complete_dialog "resetting $emulator_to_reset"
     ;;