From 33520491f3c5ef1fda810258037acc223a4b6306 Mon Sep 17 00:00:00 2001 From: icenine451 <59938822+icenine451@users.noreply.github.com> Date: Thu, 13 Apr 2023 18:48:28 -0400 Subject: [PATCH] Fix missing newlines at end of files --- .../{sha_update_list.txt => sha_update_list.cfg} | 0 automation_tools/update_sha.sh | 4 ++-- .../defaults/retrodeck/reference_lists/bios_checklist.cfg | 2 +- .../retrodeck/reference_lists/compression_targets.cfg | 2 +- .../defaults/retrodeck/reference_lists/input_validation.cfg | 2 +- .../reference_lists/multi_user_emulator_config_dirs.cfg | 2 +- .../reference_lists/zip_compressable_extensions.cfg | 2 +- emu-configs/defaults/retrodeck/retrodeck.cfg | 2 +- rd-submodules/es-de/es-de-retrodeck-mods.patch | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename automation_tools/{sha_update_list.txt => sha_update_list.cfg} (100%) diff --git a/automation_tools/sha_update_list.txt b/automation_tools/sha_update_list.cfg similarity index 100% rename from automation_tools/sha_update_list.txt rename to automation_tools/sha_update_list.cfg diff --git a/automation_tools/update_sha.sh b/automation_tools/update_sha.sh index 552dc4cd..656507d8 100644 --- a/automation_tools/update_sha.sh +++ b/automation_tools/update_sha.sh @@ -4,7 +4,7 @@ # sh automation_tools/update_sha.sh rd_manifest=${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml -sha_update_list=${GITHUB_WORKSPACE}/automation_tools/sha_update_list.txt +sha_update_list=${GITHUB_WORKSPACE}/automation_tools/sha_update_list.cfg echo "Manifest location: $rd_manifest" echo "Hash update list location: $sha_update_list" @@ -26,4 +26,4 @@ do fi done < "$sha_update_list" -echo "Done updating manifest hashes." \ No newline at end of file +echo "Done updating manifest hashes." diff --git a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg index f6deede3..bde8a54a 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg @@ -126,4 +126,4 @@ gluck.rom^fuse/^Unknown^ZX Spectrum^Pentagon 512K/1024 ROM (Required) 256s-0.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) 256s-1.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) 256s-2.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) -256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) \ No newline at end of file +256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) diff --git a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg index 09b04b68..382abc1d 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg @@ -32,4 +32,4 @@ mastersystem nds nes snes -snesna \ No newline at end of file +snesna diff --git a/emu-configs/defaults/retrodeck/reference_lists/input_validation.cfg b/emu-configs/defaults/retrodeck/reference_lists/input_validation.cfg index fab4efc4..da763c56 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/input_validation.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/input_validation.cfg @@ -3,4 +3,4 @@ uuddlrlrstart^echo Visit the Configurator to behold your new-found powers. uuddlrlrstart^echo But beware, with great power comes great responsibility... gameovermangameover^set_setting_value $rd_conf developer_options false retrodeck options gameovermangameover^echo You have relinquished your powers in the name of saftey. -gameovermangameover^echo This was a wise choice. \ No newline at end of file +gameovermangameover^echo This was a wise choice. diff --git a/emu-configs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg b/emu-configs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg index db58f32e..0b96c088 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg @@ -8,4 +8,4 @@ primehack rpcs3 Ryujinx xemu -yuzu \ No newline at end of file +yuzu diff --git a/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg b/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg index b2d370f3..585e7584 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg @@ -57,4 +57,4 @@ .unf .unif .xex -.xfd \ No newline at end of file +.xfd diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg index 79d7407d..f346d864 100644 --- a/emu-configs/defaults/retrodeck/retrodeck.cfg +++ b/emu-configs/defaults/retrodeck/retrodeck.cfg @@ -23,4 +23,4 @@ cloud_saves=false multi_user_mode=false ask_default_user=true default_user= -developer_options=false \ No newline at end of file +developer_options=false diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index c029baee..6ff1e475 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -4,9 +4,9 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" - + @@ -66,2 +67,4 @@ - + + addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && @@ -21,7 +21,7 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p + addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #endif @@ -1704,2 +1707,15 @@ - + +void GuiMenu::openRetroDeckConfigurator() +{ + // Launch the configurator.sh script