From 50bb7125b251f85242318a9a085429429d3054b3 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 21 Apr 2023 09:56:43 -0400 Subject: [PATCH] RPCS3 path updates --- emu-configs/rpcs3/vfs.yml | 4 ++-- functions.sh | 22 +++++++++++----------- post_update.sh | 24 ++++++++++++------------ 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/emu-configs/rpcs3/vfs.yml b/emu-configs/rpcs3/vfs.yml index 375a6af2..4b294861 100644 --- a/emu-configs/rpcs3/vfs.yml +++ b/emu-configs/rpcs3/vfs.yml @@ -1,4 +1,4 @@ -$(EmulatorDir): RETRODECKHOMEDIR/bios/rpcs3/emudir/ +$(EmulatorDir): RETRODECKHOMEDIR/bios/rpcs3/ /dev_hdd0/: $(EmulatorDir)dev_hdd0/ /dev_hdd1/: $(EmulatorDir)dev_hdd1/ /dev_flash/: $(EmulatorDir)dev_flash/ @@ -47,4 +47,4 @@ $(EmulatorDir): RETRODECKHOMEDIR/bios/rpcs3/emudir/ Path: "" Serial: "" VID: "" - PID: "" \ No newline at end of file + PID: "" diff --git a/functions.sh b/functions.sh index c624470d..8c4372bb 100644 --- a/functions.sh +++ b/functions.sh @@ -1574,7 +1574,7 @@ prepare_emulator() { mkdir -pv "$multi_user_data_folder/$SteamAppUser/config/rpcs3/" cp -fr $emuconfigs/rpcs3/* "$multi_user_data_folder/$SteamAppUser/config/rpcs3/" # This is an unfortunate one-off because set_setting_value does not currently support settings with $ in the name. - sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/emudir"'^' "$multi_user_data_folder/$SteamAppUser/config/rpcs3/vfs.yml" + sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3"'^' "$multi_user_data_folder/$SteamAppUser/config/rpcs3/vfs.yml" set_setting_value "$multi_user_data_folder/$SteamAppUser/config/rpcs3/vfs.yml" "/games/" "$roms_folder/ps3" "rpcs3" dir_prep "$multi_user_data_folder/$SteamAppUser/config/rpcs3" "/var/config/rpcs3" else # Single-user actions @@ -1582,22 +1582,22 @@ prepare_emulator() { mkdir -pv /var/config/rpcs3/ cp -fr $emuconfigs/rpcs3/* /var/config/rpcs3/ # This is an unfortunate one-off because set_setting_value does not currently support settings with $ in the name. - sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/emudir"'^' "$rpcs3vfsconf" + sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3"'^' "$rpcs3vfsconf" set_setting_value "$rpcs3vfsconf" "/games/" "$roms_folder/ps3" "rpcs3" - dir_prep "$bios_folder/rpcs3/emudir/dev_hdd0/00000001/savedata" "$saves_folder/ps3/rpcs3" + dir_prep "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" "$saves_folder/ps3/rpcs3" fi # Shared actions - mkdir -p "$bios_folder/rpcs3/emudir/dev_hdd0" - mkdir -p "$bios_folder/rpcs3/emudir/dev_hdd1" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash2" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash3" - mkdir -p "$bios_folder/rpcs3/emudir/dev_bdvd" - mkdir -p "$bios_folder/rpcs3/emudir/dev_usb000" + mkdir -p "$bios_folder/rpcs3/dev_hdd0" + mkdir -p "$bios_folder/rpcs3/dev_hdd1" + mkdir -p "$bios_folder/rpcs3/dev_flash" + mkdir -p "$bios_folder/rpcs3/dev_flash2" + mkdir -p "$bios_folder/rpcs3/dev_flash3" + mkdir -p "$bios_folder/rpcs3/dev_bdvd" + mkdir -p "$bios_folder/rpcs3/dev_usb000" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands # This is an unfortunate one-off because set_setting_value does not currently support settings with $ in the name. - sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/emudir"'^' "$rpcs3vfsconf" + sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3"'^' "$rpcs3vfsconf" set_setting_value "$rpcs3vfsconf" "/games/" "$roms_folder/ps3" "rpcs3" fi fi diff --git a/post_update.sh b/post_update.sh index 070353a1..4ea9580d 100644 --- a/post_update.sh +++ b/post_update.sh @@ -94,22 +94,22 @@ post_update() { unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" cp -f $emuconfigs/rpcs3/vfs.yml /var/config/rpcs3/vfs.yml - sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/emudir"'^' "$rpcs3vfsconf" + sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3"'^' "$rpcs3vfsconf" set_setting_value "$rpcs3vfsconf" "/games/" "$roms_folder/ps3" "rpcs3" if [[ -d "$roms_folder/ps3/emudir" ]]; then # The old location exists, meaning the emulator was run at least once. - mkdir "$bios_folder/ps3/emudir" - mv "$roms_folder/ps3/emudir/*" "$bios_folder/ps3/emudir/" + mkdir "$bios_folder/rpcs3" + mv "$roms_folder/ps3/emudir/*" "$bios_folder/rpcs3/" rm "$roms_folder/ps3/emudir" - configurator_generic_dialog "As part of this update and due to a RPCS3 config upgrade, the files that used to exist at\n\n~/retrodeck/roms/ps3/emudir\n\nare now located at\n\n~/retrodeck/bios/rpcs3/emudir.\nYour existing files have been moved automatically." + configurator_generic_dialog "As part of this update and due to a RPCS3 config upgrade, the files that used to exist at\n\n~/retrodeck/roms/ps3/emudir\n\nare now located at\n\n~/retrodeck/bios/rpcs3.\nYour existing files have been moved automatically." fi - mkdir -p "$bios_folder/rpcs3/emudir/dev_hdd0" - mkdir -p "$bios_folder/rpcs3/emudir/dev_hdd1" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash2" - mkdir -p "$bios_folder/rpcs3/emudir/dev_flash3" - mkdir -p "$bios_folder/rpcs3/emudir/dev_bdvd" - mkdir -p "$bios_folder/rpcs3/emudir/dev_usb000" - dir_prep "$bios_folder/rpcs3/emudir/dev_hdd0/00000001/savedata" "$saves_folder/ps3/rpcs3" + mkdir -p "$bios_folder/rpcs3/dev_hdd0" + mkdir -p "$bios_folder/rpcs3/dev_hdd1" + mkdir -p "$bios_folder/rpcs3/dev_flash" + mkdir -p "$bios_folder/rpcs3/dev_flash2" + mkdir -p "$bios_folder/rpcs3/dev_flash3" + mkdir -p "$bios_folder/rpcs3/dev_bdvd" + mkdir -p "$bios_folder/rpcs3/dev_usb000" + dir_prep "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" "$saves_folder/ps3/rpcs3" fi # The following commands are run every time.