Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-04-10 19:15:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cooker' into feat/libman

Browse source
This commit is contained in:
XargonWan 2025-01-07 23:59:55 +09:00
parent 1401743529 cd20f30d1a
commit 7e99166d83
3 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
functions/post_update.sh
View file

@ -445,22 +445,11 @@ post_update() {
rm -rf "$rd_logs_folder/ES-DE" && log d "Removing the logs/ES-DE folder as we don't need it anymore"
rm -rf "$es_source_logs" && mkdir -p "$es_source_logs"
# TODO: check this
# rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore
# TODO: change <mlc_path>RETRODECKHOMEDIR/bios/cemu</mlc_path> in config/cemu/settings.xml into <mlc_path>RETRODECKHOMEDIR/bios/cemu/mlc</mlc_path>
# if [ ! -d "$bios_folder/cemu/mlc" ]; then
# log i "Cemu MLC folder was moved from \"$bios_folder/cemu\" to \"$bios_folder/cemu/mlc\", migrating it"
# mv -f "$bios_folder/cemu" "$bios_folder/cemu/mlc"
# # TODO: set setting value mlc_path in settings.xml (check prepare script)
# fi
# if [ -f "/var/data/Cemu/keys.txt" ]; then
# log AND ZENITY "Found Cemu keys.txt" in "/var/data/Cemu/keys.txt", for a better compatibility is better to move it into "$bios_folder/cemu/mlc/keys.txt, do you want to continue?
# if yes: mv "/var/data/Cemu/keys.txt" "$bios_folder/cemu/mlc/keys.txt"
# ln -s "$bios_folder/cemu/mlc/keys.txt" "/var/data/Cemu/keys.txt" <--- AND THIS SHOULD BE EVEN PUT IN THE PREPARATION SCRIPT
# fi
# TODO: is this true?
# log i "Since in this version we restored Ryujinx to a main build we don't need the symlink anymore."
# rm "$(dirname $ryujinxconf)/PRConfig.json"
if [[ -f "$XDG_DATA_HOME/Cemu/keys.txt" ]]; then
log d "Found Cemu keys.txt in \"$XDG_DATA_HOME/Cemu/keys.txt\", moving it to \"$bios_folder/cemu/keys.txt\""
mv -f "$XDG_DATA_HOME/Cemu/keys.txt" "$bios_folder/cemu/keys.txt"
ln -s "$bios_folder/cemu/keys.txt" "$XDG_DATA_HOME/Cemu/keys.txt"
fi
fi
# The following commands are run every time.

1
functions/prepare_component.sh
View file

@ -297,6 +297,7 @@ prepare_component() {
cp -fr "$config/cemu/"* /var/config/Cemu/
set_setting_value "$cemuconf" "mlc_path" "$bios_folder/cemu" "cemu"
set_setting_value "$cemuconf" "Entry" "$roms_folder/wiiu" "cemu" "GamePaths"
rm -rf "$XDG_DATA_HOME/Cemu/keys.txt" && ln -s "$bios_folder/cemu/keys.txt" "$XDG_DATA_HOME/Cemu/keys.txt" && log d "Linked $bios_folder/cemu/keys.txt to $XDG_DATA_HOME/Cemu/keys.txt"
fi
# Shared actions
dir_prep "$saves_folder/wiiu/cemu" "$bios_folder/cemu/usr/save"

10
tools/configurator.sh
View file

@ -24,7 +24,7 @@ source /app/libexec/global.sh
# - Wii & GameCube: Presets & Settings
# - Dolphin Textures: Universal Dynamic Input
# - Primehack Textures: Universal Dynamic Input
# - Open Emulator (Behind one-time power user warning dialog)
# - Open Emulator or Component (Behind one-time power user warning dialog)
# - RetroArch
# - Cemu
# - Citra
@ -115,7 +115,7 @@ configurator_welcome_dialog() {
log i "Configurator: opening welcome dialog"
if [[ $developer_options == "true" ]]; then
welcome_menu_options=("Presets & Settings" "Here you will find various presets, tweaks and settings to customize your RetroDECK experience" \
"Open Emulator" "Launch and configure each emulator's settings (for advanced users)" \
"Open Emulator or Component" "Launch and configure each emulator or component's settings (for advanced users)" \
"RetroDECK: Tools" "Compress games, move RetroDECK and install optional features" \
"RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks and emulator resets" \
"RetroDECK: About" "Show additional information about RetroDECK" \
@ -123,7 +123,7 @@ configurator_welcome_dialog() {
"Developer Options" "Welcome to the DANGER ZONE")
else
welcome_menu_options=("Presets & Settings" "Here you find various presets, tweaks and settings to customize your RetroDECK experience" \
"Open Emulator" "Launch and configure each emulators settings (for advanced users)" \
"Open Emulator or Component" "Launch and configure each emulator or component's settings (for advanced users)" \
"RetroDECK: Tools" "Compress games, move RetroDECK and install optional features" \
"RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks checks and emulator resets" \
"RetroDECK: About" "Show additional information about RetroDECK")
@ -141,7 +141,7 @@ configurator_welcome_dialog() {
configurator_presets_and_settings_dialog
;;
"Open Emulator" )
"Open Emulator or Component" )
log i "Configurator: opening \"$choice\" menu"
configurator_power_user_warning_dialog
;;
@ -470,7 +470,7 @@ configurator_open_emulator_dialog() {
fi
emulator=$(rd_zenity --list \
--title "RetroDECK Configurator Utility - Open Emulator" --cancel-label="Back" \
--title "RetroDECK Configurator Utility - Open Emulator or Component" --cancel-label="Back" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
--text="Which emulator do you want to launch?" \
--hide-header \