From e6775b84d21eb5f3fc21fa2474a943edbb6f744d Mon Sep 17 00:00:00 2001 From: XargonWan <XargonWan@gmail.com> Date: Mon, 26 Feb 2024 14:52:55 +0100 Subject: [PATCH] SWITCH: separated the saves between Yuzu and Ryujinf cause of different directory structure [skip ci] --- functions/post_update.sh | 6 ------ functions/prepare_component.sh | 10 ++++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index 504773f3..21bb5219 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -244,12 +244,6 @@ post_update() { mv -f /var/config/emulationstation/.emulationstation /var/config/emulationstation/ES-DE # in 3.0 .emulationstation was moved into ES-DE ln -s /var/config/emulationstation/ES-DE /var/config/emulationstation/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b - # YUZU - Switch saves are now unified for both Yuzu and Ryujinx - mv $saves_folder/switch/yuzu/* $saves_folder/switch - rm -rf $saves_folder/switch/yuzu - set_setting_value "$yuzuconf" "nand_directory" "$saves_folder/switch/nand" "yuzu" "Data%20Storage" - set_setting_value "$yuzuconf" "sdmc_directory" "$saves_folder/switch/sdmc" "yuzu" "Data%20Storage" - # TODO: init Vita3K # TODO: init Ryujinx # TODO: init GZDoom diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 21536480..107890aa 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -556,6 +556,7 @@ prepare_component() { sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json" dir_prep "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" "/var/config/Ryujinx" # TODO: add nand (saves) folder management + # TODO: add nand (saves) folder management # TODO: add "registered" folder management else # removing config directory to wipe legacy files @@ -565,8 +566,9 @@ prepare_component() { sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" # Linking switch nand/saves folder rm -rf /var/config/Ryujinx/bis - dir_prep "$saves_folder/switch/nand" "/var/config/Ryujinx/bis" - dir_prep "$bios_folder/switch/registered" "/var/config/Ryujinx/bis/system/Contents/registered" + dir_prep "$saves_folder/switch/ryujinx/nand" "/var/config/Ryujinx/bis" + dir_prep "$saves_folder/switch/ryujinx/sdcard" "/var/config/Ryujinx/sdcard" + dir_prep "$bios_folder/switch/ryujinx/registered" "/var/config/Ryujinx/bis/system/Contents/registered" fi fi # if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves @@ -631,8 +633,8 @@ prepare_component() { rm -rf "$multi_user_data_folder/$SteamAppUser/config/yuzu" mkdir -p "$multi_user_data_folder/$SteamAppUser/config/yuzu" cp -fvr "$emuconfigs/yuzu/"* "$multi_user_data_folder/$SteamAppUser/config/yuzu/" - set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "nand_directory" "$saves_folder/switch/nand" "yuzu" "Data%20Storage" - set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "sdmc_directory" "$saves_folder/switch/sdmc" "yuzu" "Data%20Storage" + set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "nand_directory" "$saves_folder/switch/yuzu/nand" "yuzu" "Data%20Storage" + set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "sdmc_directory" "$saves_folder/switch/yuzu/sdmc" "yuzu" "Data%20Storage" set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "Paths\gamedirs\4\path" "$roms_folder/switch" "yuzu" "UI" set_setting_value "$multi_user_data_folder/$SteamAppUser/config/yuzu/qt-config.ini" "Screenshots\screenshot_path" "$screenshots_folder" "yuzu" "UI" dir_prep "$multi_user_data_folder/$SteamAppUser/config/yuzu" "/var/config/yuzu"