From 4a7c3313fccdcb5c9e1f83607252c3225b3dc255 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 11 May 2023 12:19:34 -0400 Subject: [PATCH] Revert RA borders dir to match existing installs --- emu-configs/defaults/retrodeck/presets/example.txt | 2 +- emu-configs/retroarch/retroarch.cfg | 4 ++-- functions.sh | 4 ++-- post_update.sh | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/example.txt b/emu-configs/defaults/retrodeck/presets/example.txt index 5891ec7c..6fe1f93b 100644 --- a/emu-configs/defaults/retrodeck/presets/example.txt +++ b/emu-configs/defaults/retrodeck/presets/example.txt @@ -2,7 +2,7 @@ config_file_format^retroarch # This is the config file format, used in functions target_file^$examplefile # This is the target file that should be updated. This will be the actively-used config file by whatever emulator is being set up. This can be a variable name as well! defaults_file^$emuconfigs/retroarch/retroarch.cfg # This is the file that is referenced when presets are disabled. This should be the "shipped" config file for this emulator change^cheevos^Enabled^true^Cheevos # This is a preset configuration line. The syntax is ^^^^ -change^borders^overlay_file^/var/config/retroarch/borders/snes.cfg # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line +change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line OTHER NOTES: diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg index 35adda5f..12b35c49 100644 --- a/emu-configs/retroarch/retroarch.cfg +++ b/emu-configs/retroarch/retroarch.cfg @@ -2995,7 +2995,7 @@ notification_show_screenshot_duration = "0" notification_show_screenshot_flash = "0" notification_show_set_initial_disk = "true" notification_show_when_menu_is_alive = "false" -overlay_directory = "/var/config/retroarch/borders" +overlay_directory = "/var/config/retroarch/overlays/borders" ozone_collapse_sidebar = "false" ozone_menu_color_theme = "1" ozone_scroll_content_metadata = "false" @@ -3249,4 +3249,4 @@ xmb_shadows_enable = "true" xmb_switch_icons = "true" xmb_theme = "0" xmb_vertical_thumbnails = "false" -youtube_stream_key = "" \ No newline at end of file +youtube_stream_key = "" diff --git a/functions.sh b/functions.sh index 0888722f..65c53ba2 100644 --- a/functions.sh +++ b/functions.sh @@ -1424,8 +1424,8 @@ prepare_emulator() { cp -fv $emuconfigs/retroarch/retroarch.cfg /var/config/retroarch/ cp -fv $emuconfigs/retroarch/retroarch-core-options.cfg /var/config/retroarch/ rsync -a --mkpath "$emuconfigs/retroarch/core-overrides/" "/var/config/retroarch/config/" - dir_prep "$borders_folder" "/var/config/retroarch/borders" - rsync -a --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/borders/" + dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" + rsync -a --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch" set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch" set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" diff --git a/post_update.sh b/post_update.sh index e022a836..3b69ca54 100644 --- a/post_update.sh +++ b/post_update.sh @@ -112,8 +112,8 @@ post_update() { dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" - dir_prep "$borders_folder" "/var/config/retroarch/borders" - rsync -a "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/borders" + dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" + rsync -a "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders" if [[ $(configurator_generic_question_dialog "RetroDECK Starter Pack" "The RetroDECK creators have put together a collection of classic retro games you might enjoy!\n\nWould you like to have them automatically added to your library?\n\nThis can always be done later through the Configurator.") == "true" ]]; then install_retrodeck_starterpack