From 1b973d58ccec1d0725b562d0af8ff32e77cea5e5 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Tue, 11 Apr 2023 09:11:12 -0400
Subject: [PATCH] More Cemu additions

---
 functions.sh | 20 +++++---------------
 retrodeck.sh |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/functions.sh b/functions.sh
index 620705c9..3d5ff6ec 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1056,6 +1056,10 @@ multi_user_link_current_user_files() {
 multi_user_selective_emu_init() {
  case "$1" in
 
+  "Cemu")
+    cemu_init
+  ;;
+  
   "citra-emu")
     citra_init
   ;;
@@ -1461,21 +1465,6 @@ cemu_init() {
   #dir_prep "$rdhome/states/cemu" "/var/data/dolphin-emu/StateSaves"
 }
 
-cemu_init() {
-  echo "----------------------"
-  echo "Initializing CEMU"
-  echo "----------------------"
-  # removing config directory to wipe legacy files
-  rm -rf /var/config/Cemu
-  mkdir -pv /var/config/Cemu/
-  cp -fvr "$emuconfigs/cemu/"* /var/config/Cemu/
-  sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' /var/config/Cemu/settings.xml
-  #TODO
-  dir_prep "$rdhome/saves/wiiu/cemu" "$rdhome/bios/cemu/usr/save"
-  #dir_prep "$rdhome/screenshots" "/var/data/dolphin-emu/ScreenShots"
-  #dir_prep "$rdhome/states/cemu" "/var/data/dolphin-emu/StateSaves"
-}
-
 standalones_init() {
   # This script is configuring the standalone emulators with the default files present in emuconfigs folder
 
@@ -1947,6 +1936,7 @@ finit() {
   # Add packaged extras, after the ROMS folder has been initialized
   cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it
 
+  tools_init
   ra_init
   standalones_init
   ) |
diff --git a/retrodeck.sh b/retrodeck.sh
index 12b6d7e8..620f0199 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -53,9 +53,9 @@ https://retrodeck.net
       ;;
     --reset-emulator*)
       echo "You are about to reset one or more RetroDECK emulators."
-      echo "Available options are: retroarch citra dolphin duckstation melonds pcsx2 ppsspp primehack rpcs3 xemu yuzu all-emulators"
+      echo "Available options are: retroarch cemu citra dolphin duckstation melonds pcsx2 ppsspp primehack rpcs3 xemu yuzu all-emulators"
       read -p "Please enter the emulator you would like to reset: " emulator
-      if [[ "$emulator" =~ ^(retroarch|citra|dolphin|duckstation|melonds|pcsx2|ppsspp|primehack|rpcs3|xemu|yuzu|all-emulators)$ ]]; then
+      if [[ "$emulator" =~ ^(retroarch|cemu|citra|dolphin|duckstation|melonds|pcsx2|ppsspp|primehack|rpcs3|xemu|yuzu|all-emulators)$ ]]; then
         read -p "You are about to reset $emulator to default settings. Enter 'y' to continue, 'n' to stop: " response
         if [[ $response == [yY] ]]; then
           cli_emulator_reset $emulator