Update dir_prep to strip trailing slashes

Fix RPCS3 savedata relocate post_update action
This commit is contained in:
icenine451 2024-03-29 15:59:01 -04:00
parent 1db8a6201b
commit 1371676da9
2 changed files with 6 additions and 9 deletions

View file

@ -236,8 +236,8 @@ dir_prep() {
# Call me with: # Call me with:
# dir prep "real dir" "symlink location" # dir prep "real dir" "symlink location"
real="$1" real="$(realpath -s $1)"
symlink="$2" symlink="$(realpath -s $2)"
log d "Preparing directory $symlink in $real" log d "Preparing directory $symlink in $real"

View file

@ -283,14 +283,11 @@ post_update() {
# The save folder of rpcs3 was inverted so we're moving the saves into the real one # The save folder of rpcs3 was inverted so we're moving the saves into the real one
log i "RPCS3 saves needs to be migrated, executing." log i "RPCS3 saves needs to be migrated, executing."
mv "$saves_folder/ps3/rpcs3" "$saves_folder/ps3/rpcs3.bak" create_dir "$backups_folder"
mkdir -p "$saves_folder/ps3/rpcs3" zip -rq9 "$backups_folder/$(date +"%0m%0d")_rpcs3_save_data.zip" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"
mv -v "$saves_folder/ps3/rpcs3.bak"/* "$saves_folder/ps3/rpcs3"
mv -v "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"/* "$saves_folder/ps3/rpcs3"
mv -v "$saves_folder/ps3/rpcs3.bak" "$rdhome/backups/saves/ps3/rpcs3"
log i "RPCS3 saves migration completed, a backup was made here: \"$rdhome/backups/saves/ps3/rpcs3\"."
source /app/libexec/functions.sh
dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"
log i "RPCS3 saves migration completed, a backup was made here: \"$backups_folder/$(date +"%0m%0d")_rpcs3_save_data.zip\"."
log i "Switch firmware folder should be moved in \"$bios_folder/switch/firmware\" from \"$bios_folder/switch/registered\"" log i "Switch firmware folder should be moved in \"$bios_folder/switch/firmware\" from \"$bios_folder/switch/registered\""
mv "$bios_folder/switch/registered" "$bios_folder/switch/firmware" mv "$bios_folder/switch/registered" "$bios_folder/switch/firmware"