From 534084b59cd37c119c5568c196d64a2169a66fe2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 19 Feb 2024 16:24:48 +0100 Subject: [PATCH 01/12] ES-DE: changed branch in manifest --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5d895820..5e5aba2e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -419,7 +419,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK-ES-DE - branch: cebbeff3b5f834fd9adaeb1f5dc9e0da6b106599 + branch: update/3.0 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 8541752e2ece326e610cde9532227634aa8a311b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 08:50:54 +0100 Subject: [PATCH 02/12] ES-DE: fixed systems path from unix to linux --- net.retrodeck.retrodeck.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5e5aba2e..d95c2908 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -407,7 +407,7 @@ modules: - '*.la' # When updating this module remember to check those: - # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml + # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/linux/es_find_rules.xml # But we don't include them 1:1 as RetroDECK got some specific configs in some cases - name: ES-DE buildsystem: cmake-ninja @@ -1302,10 +1302,10 @@ modules: - mkdir -p ${FLATPAK_DEST}/retrodeck # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon - - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml - - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/ + - rm -rf /app/share/emulationstation/resources/systems/linux/es_find_rules.xml + - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/linux/ + - rm -rf /app/share/emulationstation/resources/systems/linux/es_systems.xml + - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/linux/ # These must be put in home folder, managed by retrodeck.sh - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml - mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks From 8fec21f9ad5c7421c408a232f333255d1a969526 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 21:18:29 +0100 Subject: [PATCH 03/12] ES-DE: updating paths to es-de folder --- functions/global.sh | 2 +- net.retrodeck.retrodeck.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/functions/global.sh b/functions/global.sh index b71b1b3e..60f7a966 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -29,7 +29,7 @@ splashscreen_dir="/var/config/emulationstation/ES-DE/resources/graphics/extra_sp current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot default_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen multi_user_emulator_config_dirs="$emuconfigs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg" # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode -rd_es_themes="/app/share/emulationstation/themes" # The directory where themes packaged with RetroDECK are stored +rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located default_sd="/run/media/mmcblk0p1" # Steam Deck SD default path hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index d95c2908..c330496a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -433,8 +433,8 @@ modules: - name: art-book-next-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ + - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/ + - mv -f * ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/ sources: - type: git url: https://github.com/anthonycaccese/art-book-next-es-de.git @@ -1302,16 +1302,16 @@ modules: - mkdir -p ${FLATPAK_DEST}/retrodeck # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon - - rm -rf /app/share/emulationstation/resources/systems/linux/es_find_rules.xml - - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/linux/ - - rm -rf /app/share/emulationstation/resources/systems/linux/es_systems.xml - - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/linux/ + - rm -rf /app/share/es-de/resources/systems/linux/es_find_rules.xml + - cp es-configs/es_find_rules.xml /app/share/es-de/resources/systems/linux/ + - rm -rf /app/share/es-de/resources/systems/linux/es_systems.xml + - cp es-configs/es_systems.xml /app/share/es-de/resources/systems/linux/ # These must be put in home folder, managed by retrodeck.sh - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml - mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks # Logo, res, move graphics directory away from default location so splash can be changed after build - - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics + - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/es-de/resources/graphics - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash.svg - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg - cp -rf res/extra_splashes/ ${FLATPAK_DEST}/retrodeck/graphics From eb126928910e67d201ac138b38eed436180475e3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 10:00:52 +0100 Subject: [PATCH 04/12] ES-DE: changing more paths --- es-configs/es_settings.xml | 2 +- functions/050_save_migration.sh | 6 +- functions/functions.sh | 14 +-- functions/global.sh | 8 +- functions/post_update.sh | 6 +- functions/prepare_component.sh | 12 +-- net.retrodeck.retrodeck.yml | 4 - rd-submodules/es-de/GuiMenu.cpp.patch | 38 ------- rd-submodules/es-de/GuiMenu.h.patch | 10 -- .../es-de/GuiThemeDownloader.cpp.patch | 10 -- rd-submodules/es-de/ViewController.cpp.patch | 101 ------------------ rd-submodules/es-de/Window.cpp.patch | 9 -- rd-submodules/es-de/patch_helper.sh | 31 ------ tools/configurator.sh | 2 +- 14 files changed, 26 insertions(+), 227 deletions(-) delete mode 100644 rd-submodules/es-de/GuiMenu.cpp.patch delete mode 100644 rd-submodules/es-de/GuiMenu.h.patch delete mode 100644 rd-submodules/es-de/GuiThemeDownloader.cpp.patch delete mode 100644 rd-submodules/es-de/ViewController.cpp.patch delete mode 100644 rd-submodules/es-de/Window.cpp.patch delete mode 100755 rd-submodules/es-de/patch_helper.sh diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index cad78b67..117f1800 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -145,7 +145,7 @@ - + diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 41213705..786686fc 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -28,12 +28,12 @@ save_migration() { fi # Doing the dir prep as we don't know from which version we came - dir_prep "$media_folder" "/var/config/emulationstation/ES-DE/downloaded_media" - dir_prep "$themes_folder" "/var/config/emulationstation/ES-DE/themes" + dir_prep "$media_folder" "/var/config/es-de/ES-DE/downloaded_media" + dir_prep "$themes_folder" "/var/config/es-de/ES-DE/themes" mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index a03d1e35..b5bf389d 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -486,9 +486,9 @@ install_retrodeck_starterpack() { ## DOOM section ## cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it - mkdir -p "/var/config/emulationstation/ES-DE/gamelists/doom" - if [[ ! -f "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist - cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" + mkdir -p "/var/config/es-de/ES-DE/gamelists/doom" + if [[ ! -f "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist + cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" fi mkdir -p "$media_folder/doom" unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" @@ -519,8 +519,8 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/emulationstation/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/ES-DE/resources/graphics/" + rm -rf /var/config/es-de/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/es-de/ES-DE/resources/graphics/" } deploy_helper_files() { @@ -564,12 +564,12 @@ easter_eggs() { quit_retrodeck() { pkill -f retrodeck - pkill -f emulationstation + pkill -f es-de } start_retrodeck() { easter_eggs # Check if today has a surprise splashscreen and load it if so # normal startup echo "Starting RetroDECK v$version" - emulationstation --home /var/config/emulationstation + es-de --home /var/config/es-de } diff --git a/functions/global.sh b/functions/global.sh index 60f7a966..9a6ba230 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,9 +25,9 @@ zip_compressable_extensions="$emuconfigs/defaults/retrodeck/reference_lists/zip_ easter_egg_checklist="$emuconfigs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg" # A config file listing days and times when special splash screens should show up input_validation="$emuconfigs/defaults/retrodeck/reference_lists/input_validation.cfg" # A config file listing valid CLI inputs finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options_list.cfg" # A config file listing available optional installs during finit -splashscreen_dir="/var/config/emulationstation/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens -current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot -default_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen +splashscreen_dir="/var/config/es-de/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen multi_user_emulator_config_dirs="$emuconfigs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg" # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located @@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/emulationstation/ES-DE/es_settings.xml" +es_settings="/var/config/es-de/ES-DE/es_settings.xml" # RetroArch config files diff --git a/functions/post_update.sh b/functions/post_update.sh index ec9acee5..2355807c 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -241,8 +241,10 @@ post_update() { # - Install RetroDECK controller profile in desired location TODO # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names - mv -f /var/config/emulationstation/.emulationstation /var/config/emulationstation/ES-DE # in 3.0 .emulationstation was moved into ES-DE - ln -s /var/config/emulationstation/ES-DE /var/config/emulationstation/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b + # in 3.0 .emulationstation was moved into ES-DE + mv -f /var/config/es-de/ /var/config/es-de/ES-DE + mv -f /var/config/es-de/.emulationstation /var/config/es-de/ES-DE + ln -s /var/config/es-de/ES-DE /var/config/es-de/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b fi # if [[ $prev_version -le "090" ]]; then diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 206fc3dc..e09258d2 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -39,21 +39,21 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then - rm -rf /var/config/emulationstation/ - mkdir -p /var/config/emulationstation/ES-DE/ - cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml + rm -rf /var/config/es-de/ + mkdir -p /var/config/es-de/ES-DE/ + cp -f /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" - emulationstation --home /var/config/emulationstation --create-system-dirs + dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + es-de --home /var/config/es-de --create-system-dirs update_splashscreens fi if [[ "$action" == "postmove" ]]; then set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" fi fi diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c330496a..ae428e37 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -421,10 +421,6 @@ modules: url: https://github.com/XargonWan/RetroDECK-ES-DE branch: update/3.0 - type: shell - commands: - - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK - v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' - es-app/src/guis/GuiMenu.cpp # ES-DE - END diff --git a/rd-submodules/es-de/GuiMenu.cpp.patch b/rd-submodules/es-de/GuiMenu.cpp.patch deleted file mode 100644 index b0c035ea..00000000 --- a/rd-submodules/es-de/GuiMenu.cpp.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:12:15.617292576 +0200 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:44:10.736412006 +0200 -@@ -67,2 +67,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); -+ - if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +72,3 @@ - #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #else -@@ -75,3 +77,3 @@ - else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #endif -@@ -1758,3 +1760,3 @@ - auto quitText = std::make_shared( -- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); -+ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - quitText->setSelectable(true); -@@ -1910 +1912,14 @@ - } -+ -+void GuiMenu::openRetroDeckConfigurator() -+{ -+ // Launch the configurator.sh script -+ std::string command; -+ std::string startDirectory; -+ bool runInBackground; -+ command = "bash /app/tools/configurator.sh"; -+ startDirectory = "/app/tools"; -+ runInBackground = false; -+ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); -+ // You can add any checks for the script's outcome here. -+} diff --git a/rd-submodules/es-de/GuiMenu.h.patch b/rd-submodules/es-de/GuiMenu.h.patch deleted file mode 100644 index 13a6b687..00000000 --- a/rd-submodules/es-de/GuiMenu.h.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-08-23 13:12:15.617292576 +0200 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-08-23 13:50:20.978700234 +0200 -@@ -46,2 +46,3 @@ - void openOtherOptions(); -+ void openRetroDeckConfigurator(); - void openQuitMenu(); -@@ -54 +55,2 @@ - #endif // ES_APP_GUIS_GUI_MENU_H -+ diff --git a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch b/rd-submodules/es-de/GuiThemeDownloader.cpp.patch deleted file mode 100644 index 8dd35293..00000000 --- a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ---- emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:25:01.115126901 +0100 -+++ emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:26:18.882607724 +0100 -@@ -602,4 +602,4 @@ - getHelpStyle(), -- "IT SEEMS AS IF YOU'RE NOT RUNNING THE LATEST ES-DE RELEASE, PLEASE UPGRADE BEFORE " -- "PROCEEDING AS THESE THEMES MAY NOT BE COMPATIBLE WITH YOUR VERSION", -+ "ES-DE THEME ENGINE WAS UPDATED UPSTREAM. THESE THEMES MAY NOT BE COMPATIBLE WITH THE CURRENT RETRODECK VERSION." -+ "CHECK IF A NEW RETRODECK UPDATE IS AVAILABLE, ELSE PLEASE WAIT FOR IT OR PROCEED AT YOUR OWN RISK.", - "OK", [] { return; }, "", nullptr, "", nullptr, nullptr, true)); diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch deleted file mode 100644 index 8d677c37..00000000 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 15:09:24.332178777 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 15:13:59.015780009 -0400 -@@ -195,91 +195,3 @@ - mNoGamesMessageBox = new GuiMsgBox( -- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", -- [this] { -- std::string currentROMDirectory; --#if defined(_WIN64) -- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- currentROMDirectory = FileData::getROMDirectory(); --#endif -- if (Settings::getInstance()->getBool("VirtualKeyboard")) { -- mWindow->pushGui(new GuiTextEditKeyboardPopup( -- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this, currentROMDirectory](const std::string& newROMDirectory) { -- if (currentROMDirectory != newROMDirectory) { -- Settings::getInstance()->setString( -- "ROMDirectory", Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- nullptr, true, true)); -- } -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- else { -- mWindow->pushGui(new GuiTextEditPopup( -- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- nullptr, true)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- }, -- "CREATE DIRECTORIES", -- [this] { -- mWindow->pushGui(new GuiMsgBox( -- HelpStyle(), -- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" -- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" -- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" -- "ADVICED TO REMOVE THE ONES YOU DON'T NEED", -- "PROCEED", -- [this] { -- if (!SystemData::createSystemDirectories()) { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" -- "GENERATED, EXIT THE APPLICATION AND PLACE\n" -- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", -- "OK", nullptr, "", nullptr, "", nullptr, -- nullptr, true)); -- } -- else { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" -- "PERMISSION PROBLEMS OR DISK FULL?\n\n" -- "SEE THE LOG FILE FOR MORE DETAILS", -- "OK", nullptr, "", nullptr, "", nullptr, -- nullptr, true)); -- } -- }, -- "CANCEL", nullptr, "", nullptr, nullptr, false)); -- }, -- "QUIT", -+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", - [] { -@@ -289,3 +201,3 @@ - }, -- nullptr, true, false, -+ "", nullptr, "", nullptr, nullptr, true, true, - (mRenderer->getIsVerticalOrientation() ? diff --git a/rd-submodules/es-de/Window.cpp.patch b/rd-submodules/es-de/Window.cpp.patch deleted file mode 100644 index c099d83b..00000000 --- a/rd-submodules/es-de/Window.cpp.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:14:17.208301836 +0200 -+++ emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:12:37.307334069 +0200 - -@@ -181,3 +181,3 @@ - progressBarRect.barPosY += borderThickness; -- progressBarRect.color = 0x79010FFF; -+ progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh deleted file mode 100755 index 27923b97..00000000 --- a/rd-submodules/es-de/patch_helper.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -mkdir /tmp - -branch="00a226062fff37209d98e0ab048ac89af50ecacc" -git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de - -pushd . -cd /tmp/emulationstation-de -git checkout $branch -popd - -mkdir patches-tmp - -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp - -read -p "Please edit the files in \"patches-tmp\" and press enter to continue." - -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp/GuiMenu.cpp > GuiMenu.cpp.patch -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp/GuiMenu.h > GuiMenu.h.patch -diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch -diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp/GuiThemeDownloader.cpp > GuiThemeDownloader.cpp.patch - -rm -rf patches-tmp - -echo "Done, now please remeber to edit the headers of the patch files with the correct paths." \ No newline at end of file diff --git a/tools/configurator.sh b/tools/configurator.sh index d474a279..437e99fc 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -1348,7 +1348,7 @@ configurator_usb_import_dialog() { "${external_devices[@]}") if [[ ! -z "$choice" ]]; then - emulationstation --home "$choice" --create-system-dirs + es-de --home "$choice" --create-system-dirs rm -rf "$choice/ES-DE" # Cleanup unnecessary folder fi else From f8a86faa4be45efddaa1cb79025d9142faa02a0d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 14:26:23 +0100 Subject: [PATCH 05/12] ES-DE: changing more paths, again --- es-configs/es_settings.xml | 2 +- functions/050_save_migration.sh | 6 +++--- functions/functions.sh | 12 ++++++------ functions/global.sh | 8 ++++---- functions/prepare_component.sh | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 117f1800..8ec2ff62 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -145,7 +145,7 @@ - + diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 786686fc..55f3d679 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -28,12 +28,12 @@ save_migration() { fi # Doing the dir prep as we don't know from which version we came - dir_prep "$media_folder" "/var/config/es-de/ES-DE/downloaded_media" - dir_prep "$themes_folder" "/var/config/es-de/ES-DE/themes" + dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media" + dir_prep "$themes_folder" "/var/config/ES-DE/themes" mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index 6ac742f3..c69d69ed 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -486,9 +486,9 @@ install_retrodeck_starterpack() { ## DOOM section ## cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it - mkdir -p "/var/config/es-de/ES-DE/gamelists/doom" - if [[ ! -f "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist - cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" + mkdir -p "/var/config/ES-DE/gamelists/doom" + if [[ ! -f "/var/config/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist + cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/ES-DE/gamelists/doom/gamelist.xml" fi mkdir -p "$media_folder/doom" unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" @@ -519,8 +519,8 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/es-de/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/es-de/ES-DE/resources/graphics/" + rm -rf /var/config/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/" } deploy_helper_files() { @@ -631,5 +631,5 @@ start_retrodeck() { easter_eggs # Check if today has a surprise splashscreen and load it if so # normal startup echo "Starting RetroDECK v$version" - es-de --home /var/config/es-de + es-de --home /var/config/ES-DE } diff --git a/functions/global.sh b/functions/global.sh index 9a6ba230..ef5b760f 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,9 +25,9 @@ zip_compressable_extensions="$emuconfigs/defaults/retrodeck/reference_lists/zip_ easter_egg_checklist="$emuconfigs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg" # A config file listing days and times when special splash screens should show up input_validation="$emuconfigs/defaults/retrodeck/reference_lists/input_validation.cfg" # A config file listing valid CLI inputs finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options_list.cfg" # A config file listing available optional installs during finit -splashscreen_dir="/var/config/es-de/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens -current_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot -default_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen +splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen multi_user_emulator_config_dirs="$emuconfigs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg" # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located @@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/es-de/ES-DE/es_settings.xml" +es_settings="/var/config/ES-DE/es_settings.xml" # RetroArch config files diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 95b1d0ac..1b293919 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -40,12 +40,12 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then rm -rf /var/config/es-de/ - mkdir -p /var/config/es-de/ES-DE/ - cp -f /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml + mkdir -p /var/config/ES-DE/ + cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" es-de --home /var/config/es-de --create-system-dirs update_splashscreens fi @@ -53,7 +53,7 @@ prepare_component() { set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" fi fi From 42df8149e1878b481a63cf874beed1770da72218 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 14:26:37 +0100 Subject: [PATCH 06/12] ES-DE: post update scripts cleanup --- functions/post_update.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index 2355807c..5a3dec56 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -242,9 +242,7 @@ post_update() { # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names # in 3.0 .emulationstation was moved into ES-DE - mv -f /var/config/es-de/ /var/config/es-de/ES-DE - mv -f /var/config/es-de/.emulationstation /var/config/es-de/ES-DE - ln -s /var/config/es-de/ES-DE /var/config/es-de/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b + mv -f /var/config/emulationstation /var/config/ES-DE fi # if [[ $prev_version -le "090" ]]; then From 049f7a80a93dfc40779f34037b1eaba1cb6c27d6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 21:39:44 +0100 Subject: [PATCH 07/12] ES-DE: changing more paths, again and again --- functions/050_save_migration.sh | 2 +- functions/functions.sh | 2 +- functions/global.sh | 2 +- functions/prepare_component.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 55f3d679..42632f1f 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -33,7 +33,7 @@ save_migration() { mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index f1d0a7cb..4f393f43 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -651,5 +651,5 @@ start_retrodeck() { easter_eggs # Check if today has a surprise splashscreen and load it if so # normal startup echo "Starting RetroDECK v$version" - es-de --home /var/config/ES-DE + es-de --home /var/config/ } diff --git a/functions/global.sh b/functions/global.sh index 6c8d889f..be52f198 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -62,7 +62,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/ES-DE/es_settings.xml" +es_settings="/var/config/ES-DE/settings/es_settings.xml" # RetroArch config files diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index edeeda55..e0059e43 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -42,12 +42,12 @@ prepare_component() { if [[ "$action" == "reset" ]]; then rm -rf /var/config/es-de/ mkdir -p /var/config/ES-DE/ - cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml + cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" - es-de --home /var/config/es-de --create-system-dirs + es-de --home /var/config/ES-DE --create-system-dirs update_splashscreens fi if [[ "$action" == "postmove" ]]; then From 965795d00a47b743a2c86d827c289c34ebae8a7b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 21:40:06 +0100 Subject: [PATCH 08/12] ES-DE: updated es_settings for 3.0 --- es-configs/es_settings.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 8ec2ff62..50cd7b18 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -2,6 +2,7 @@ + @@ -21,6 +22,7 @@ + @@ -65,6 +67,7 @@ + @@ -145,6 +148,7 @@ + @@ -152,6 +156,7 @@ + From 91d67db37ebaf1238da6a4d21d18ed1c2f5c8846 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Feb 2024 10:00:50 +0100 Subject: [PATCH 09/12] SPLASHES: fixed splashes directory --- functions/functions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 4f393f43..1c8024a5 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -539,8 +539,10 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/" + rm -rf /var/config/ES-DE/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/ES-DE/resources/graphics/" + + # NOTE: for some reason some stuff is still created in ES-DE/ES-DE so this path is correct } deploy_helper_files() { From 7dd5e618dc105075be949944838c1d736b080f2a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 23 Feb 2024 15:50:03 +0100 Subject: [PATCH 10/12] SPLASHES: fixed splashes directory, again --- functions/functions.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 1c8024a5..2567037b 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -539,10 +539,9 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/ES-DE/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/ES-DE/resources/graphics/" + rm -rf /var/config/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/" - # NOTE: for some reason some stuff is still created in ES-DE/ES-DE so this path is correct } deploy_helper_files() { From 2bf3a68026ee1daf5774afc4aaede230bab7efab Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 24 Feb 2024 08:50:32 +0100 Subject: [PATCH 11/12] ES-DE: fixed wrong folders, creating until settings folder --- functions/prepare_component.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 0c5f56f8..b22982f9 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -40,8 +40,8 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then - rm -rf /var/config/es-de/ - mkdir -p /var/config/ES-DE/ + rm -rf /var/config/ES-DE + mkdir -p /var/config/ES-DE/settings cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/settings/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" From 1a0e13135484d14daf7d84bd9ac67e225b3ebc6b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sun, 25 Feb 2024 16:15:40 +0100 Subject: [PATCH 12/12] ES-DE: needed update steps --- functions/post_update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/functions/post_update.sh b/functions/post_update.sh index 5a3dec56..6dc65eae 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -241,8 +241,13 @@ post_update() { # - Install RetroDECK controller profile in desired location TODO # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names + # in 3.0 .emulationstation was moved into ES-DE mv -f /var/config/emulationstation /var/config/ES-DE + mv -f /var/config/ES-DE/.emulationstation/* /var/config/ES-DE + rm -rf /var/config/ES-DE/.emulationstation + rm -f /var/config/ES-DE/es_settings.xml + prepare_component "reset" "es-de" fi # if [[ $prev_version -le "090" ]]; then