From 2b85d32e9ef49f6017ce654229c7a08502d97a4f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 28 Feb 2024 10:17:03 +0100 Subject: [PATCH] MAME: config paths fixes --- functions/global.sh | 3 ++- functions/prepare_component.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/functions/global.sh b/functions/global.sh index 87d08faf..43041bec 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -115,7 +115,8 @@ vita3kusrconfdir="$bios_folder/Vita3K/Vita3K" # MAME-SA config files mameconf="/var/config/mame/mame.ini" -mameuiconf="$bios_folder/Vita3K/ui.ini" +mameuiconf="/var/config/mame/ui.ini" +mamedefconf="/var/config/mame/cfg/default.cfg" # We moved the lockfile in /var/config/retrodeck in order to solve issue #53 - Remove in a few versions if [[ -f "$HOME/retrodeck/.lock" ]]; then diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 04f48a9c..95fe3268 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -757,9 +757,9 @@ prepare_component() { mkdir -p "/var/data/mame/assets/ui" dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore" - cp -fvr "$emuconfigs/mame/mame.ini" "/var/config/mame/cfg" - cp -fvr "$emuconfigs/mame/ui.ini" "/var/config/mame/cfg" - cp -fvr "$emuconfigs/mame/default.cfg" "/var/config/mame/cfg" + cp -fvr "$emuconfigs/mame/mame.ini" "$mameconf" + cp -fvr "$emuconfigs/mame/ui.ini" "$mameuiconf" + cp -fvr "$emuconfigs/mame/default.cfg" "$mamedefconf" sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "$mameconf" # one-off as roms folders are a lot set_setting_value "$mameconf" "nvram_directory" "$saves_folder/mame-sa/nvram" "mame"