diff --git a/.readthedocs.yaml b/.readthedocs.yaml deleted file mode 100644 index 5bf1fa68..00000000 --- a/.readthedocs.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Read the Docs configuration file -# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details - -# Required -version: 2 - -# Set the OS, Python version and other tools you might need -build: - os: ubuntu-22.04 - tools: - python: "3.11" - # You can also specify other tool versions: - # nodejs: "19" - # rust: "1.64" - # golang: "1.19" - -# Build documentation in the "docs/" directory with Sphinx -sphinx: - configuration: wiki-rtd/conf.py - -# Optionally build your docs in additional formats such as PDF and ePub -formats: - - pdf - - epub - -# Optional but recommended, declare the Python requirements required -# to build your documentation -# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html -python: - install: - - requirements: wiki-rtd/requirements.txt \ No newline at end of file diff --git a/README.md b/README.md index 35db1371..671a783d 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ Read up here on how to help out, there is something for everyone: |-------------------------------------------------------------|-----------------------------------------------------------| | [RetroDECK](https://github.com/XargonWan/RetroDECK) | This one, our main repo where the core of the project is | | [RetroDECK-cooker](https://github.com/XargonWan/RetroDECK-cooker) | Where we publish our test build, no code is hosted here | +| [RetroDECK-Wiki](https://github.com/XargonWan/RetroDECK-Wiki) | Where our wiki source code is | | [RetroDECK on Flathub](https://github.com/flathub/net.retrodeck.retrodeck) | Our little space in Flathub's organization | | [RetroDECK-MAME](https://github.com/XargonWan/RetroDECK-MAME) | MAME is big to build, so it's pre-built here and then imported in the build | | [RetroDECK-ES-DE](https://github.com/XargonWan/RetroDECK-ES-DE) | This is where we store our patched fork of ES-DE | diff --git a/functions/post_update.sh b/functions/post_update.sh index 36029671..464f4f7d 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -269,11 +269,25 @@ post_update() { if [[ $prev_version -le "075" ]]; then # In version 0.7.5b, the following changes were made: + # TODO: vita3k init + # TODO: MAME init if [ -d "$rdhome/.logs" ]; then mv "$rdhome/.logs" "$logs_folder" log i "Logs folder renamed successfully" else log i "The .logs folder does not exist, continuing." fi + + # The save folder of rpcs3 was inverted so we're moving the saves into the real one + echo "RPCS3 saves needs to be migrated, executing." + mv "$saves_folder/ps3/rpcs3" "$saves_folder/ps3/rpcs3.bak" + mkdir -p "$saves_folder/ps3/rpcs3" + 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" + echo "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" + fi } diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index 91ad7cbd..13af415b 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -303,8 +303,9 @@ prepare_emulator() { set_setting_value "$multi_user_data_folder/$SteamAppUser/data/duckstation/settings.ini" "RecursivePaths" "$roms_folder/psx" "duckstation" "GameList" dir_prep "$multi_user_data_folder/$SteamAppUser/config/duckstation" "/var/config/duckstation" else # Single-user actions - rm -rf /var/config/duckstation - mkdir -p /var/config/duckstation/ + rm -rf "/var/config/duckstation" + mkdir -p "/var/config/duckstation/" + mkdir -p "$saves_folder/psx/duckstation/memcards" cp -fv "$emuconfigs/duckstation/"* /var/config/duckstation set_setting_value "$duckstationconf" "SearchDirectory" "$bios_folder" "duckstation" "BIOS" set_setting_value "$duckstationconf" "Card1Path" "$saves_folder/psx/duckstation/memcards/shared_card_1.mcd" "duckstation" "MemoryCards" @@ -523,7 +524,7 @@ prepare_emulator() { # 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/"'^' "$rpcs3vfsconf" set_setting_value "$rpcs3vfsconf" "/games/" "$roms_folder/ps3/" "rpcs3" - dir_prep "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" "$saves_folder/ps3/rpcs3" + dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" fi # Shared actions mkdir -p "$bios_folder/rpcs3/dev_hdd0"