From a0a669a16fc6b7fc9ff4316b3c89ac39bdbb764a Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 6 May 2024 09:01:14 -0400 Subject: [PATCH 1/2] Reorder GBA overlay preset commands --- emu-configs/defaults/retrodeck/presets/gba_presets.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg index 170c0e17..7f4d649e 100644 --- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg @@ -4,9 +4,9 @@ change^borders^custom_viewport_height^640^^/var/config/retroarch/config/mGBA/gba change^borders^custom_viewport_width^960^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^custom_viewport_x^160^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^custom_viewport_y^0^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_scale_landscape^1.2150000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg enable^abxy_button_swap^/var/config/retroarch/config/remaps/mGBA/gba.rmp From 5ed2ecd11005e9af0a15ff13cdab6fd39accae3a Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 6 May 2024 10:00:31 -0400 Subject: [PATCH 2/2] Fix similar-name setting detection in presets engine --- functions/presets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/presets.sh b/functions/presets.sh index c5d8af4a..19fcbcec 100644 --- a/functions/presets.sh +++ b/functions/presets.sh @@ -128,7 +128,7 @@ build_preset_config() { create_dir "$(realpath "$(dirname "$read_target_file")")" echo "$read_setting_name = \""$new_setting_value"\"" > "$read_target_file" else - if [[ -z $(grep "$read_setting_name" "$read_target_file") ]]; then + if [[ -z $(grep -o -P "^$read_setting_name\b" "$read_target_file") ]]; then add_setting "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section" else set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section"