Merge pull request #3404 from joolswills/defaultRASystemConfig

Add defaultRAConfig to replace ensureSystemretroconfig

Author: joolswills

scriptmodules/helpers.sh

@@ -939,37 +939,59 @@ function setESSystem() {
 
 ## @fn ensureSystemretroconfig()
 ## @param system system to create retroarch.cfg for
-## @param shader set a default shader to use (deprecated)
-## @brief Creates a default retroarch.cfg for specified system in `/opt/retropie/configs/$system/retroarch.cfg`.
+## @brief Deprecated - use defaultRAConfig
+## @details Creates a default retroarch.cfg for specified system in `$configdir/$system/retroarch.cfg`.
 function ensureSystemretroconfig() {
     # don't do any config work on module removal
     [[ "$md_mode" == "remove" ]] && return
 
+    # reset "$md_conf_root" to "$configdir" as defaultRAConfig handles this whereas ensureSystemretroconfig
+    # expects system to include any subdirectory in the first parameter such as "ports/$system".
+    local save_conf_root="$md_conf_root"
+    md_conf_root="$configdir"
+    defaultRAConfig "$1"
+    md_conf_root="$save_conf_root"
+}
+
+## @fn defaultRAConfig()
+## @param system system to create retroarch.cfg for
+## @param ... optional key then value parameters to be used in the config
+## @brief Creates a default retroarch.cfg for specified system in `$md_root_dir/$system/retroarch.cfg`.
+## @details Additional default configuration values can be provided as parameters to the function - eg. "fps_show" "true"
+## as two parameters would add a default entry of fps_show = "true" to the default configuration.
+## This function uses $md_conf_root as a base, so there is no need to use "ports/$system" for libretro ports as with
+## the older ensureSystemretroconfig
+function defaultRAConfig() {
+    # don't do any config work on module removal
+    [[ "$md_mode" == "remove" ]] && return
+
     local system="$1"
-    local shader="$2"
+    shift
+    local defaults=("$@")
 
-    if [[ ! -d "$configdir/$system" ]]; then
-        mkUserDir "$configdir/$system"
-    fi
+    local config_path="$md_conf_root/$system"
+
+    [[ ! -d "$config_path" ]] && mkUserDir "$config_path"
 
     local config="$(mktemp)"
     # add the initial comment regarding include order
     echo -e "# Settings made here will only override settings in the global retroarch.cfg if placed above the #include line\n" >"$config"
 
     # add the per system default settings
     iniConfig " = " '"' "$config"
-    iniSet "input_remapping_directory" "$configdir/$system/"
+    iniSet "input_remapping_directory" "$config_path"
 
-    if [[ -n "$shader" ]]; then
-        iniUnset "video_smooth" "false"
-        iniSet "video_shader" "$emudir/retroarch/shader/$shader"
-        iniUnset "video_shader_enable" "true"
-    fi
+    # add any additional config key / values from function parameters
+    local key
+    local value
+    while read key value; do
+        [[ -n "$key" ]] && iniSet "$key" "$value"
+    done <<< "${defaults[@]}"
 
     # include the main retroarch config
     echo -e "\n#include \"$configdir/all/retroarch.cfg\"" >>"$config"
 
-    copyDefaultConfig "$config" "$configdir/$system/retroarch.cfg"
+    copyDefaultConfig "$config" "$config_path/retroarch.cfg"
     rm "$config"
 }
 

scriptmodules/libretrocores/lr-81.sh

@@ -35,7 +35,7 @@ function install_lr-81() {
 
 function configure_lr-81() {
     mkRomDir "zx81"
-    ensureSystemretroconfig "zx81"
+    defaultRAConfig "zx81"
 
     addEmulator 1 "$md_id" "zx81" "$md_inst/81_libretro.so"
     addSystem "zx81"

scriptmodules/libretrocores/lr-atari800.sh

@@ -37,8 +37,8 @@ function configure_lr-atari800() {
     mkRomDir "atari800"
     mkRomDir "atari5200"
 
-    ensureSystemretroconfig "atari800"
-    ensureSystemretroconfig "atari5200"
+    defaultRAConfig "atari800"
+    defaultRAConfig "atari5200"
 
     mkUserDir "$md_conf_root/atari800"
     moveConfigFile "$home/.lr-atari800.cfg" "$md_conf_root/atari800/lr-atari800.cfg"

scriptmodules/libretrocores/lr-beetle-lynx.sh

@@ -34,7 +34,7 @@ function install_lr-beetle-lynx() {
 
 function configure_lr-beetle-lynx() {
     mkRomDir "atarilynx"
-    ensureSystemretroconfig "atarilynx"
+    defaultRAConfig "atarilynx"
 
     addEmulator 0 "$md_id" "atarilynx" "$md_inst/mednafen_lynx_libretro.so"
     addSystem "atarilynx"

scriptmodules/libretrocores/lr-beetle-ngp.sh

@@ -41,7 +41,7 @@ function configure_lr-beetle-ngp() {
     local system
     for system in ngp ngpc; do
         mkRomDir "$system"
-        ensureSystemretroconfig "$system"
+        defaultRAConfig "$system"
         addEmulator 1 "$md_id" "$system" "$md_inst/mednafen_ngp_libretro.so"
         addSystem "$system"
     done

scriptmodules/libretrocores/lr-beetle-pce-fast.sh

@@ -40,7 +40,7 @@ function install_lr-beetle-pce-fast() {
 
 function configure_lr-beetle-pce-fast() {
     mkRomDir "pcengine"
-    ensureSystemretroconfig "pcengine"
+    defaultRAConfig "pcengine"
 
     addEmulator 1 "$md_id" "pcengine" "$md_inst/mednafen_pce_fast_libretro.so"
     addSystem "pcengine"

scriptmodules/libretrocores/lr-beetle-pcfx.sh

@@ -34,7 +34,7 @@ function install_lr-beetle-pcfx() {
 
 function configure_lr-beetle-pcfx() {
     mkRomDir "pcfx"
-    ensureSystemretroconfig "pcfx"
+    defaultRAConfig "pcfx"
 
     addEmulator 1 "$md_id" "pcfx" "$md_inst/mednafen_pcfx_libretro.so"
     addSystem "pcfx"

scriptmodules/libretrocores/lr-beetle-psx.sh

@@ -42,7 +42,7 @@ function install_lr-beetle-psx() {
 
 function configure_lr-beetle-psx() {
     mkRomDir "psx"
-    ensureSystemretroconfig "psx"
+    defaultRAConfig "psx"
 
     addEmulator 0 "$md_id" "psx" "$md_inst/mednafen_psx_hw_libretro.so"
     addSystem "psx"

scriptmodules/libretrocores/lr-beetle-saturn.sh

@@ -35,7 +35,7 @@ function install_lr-beetle-saturn() {
 
 function configure_lr-beetle-saturn() {
     mkRomDir "saturn"
-    ensureSystemretroconfig "saturn"
+    defaultRAConfig "saturn"
 
     addEmulator 1 "$md_id" "saturn" "$md_inst/mednafen_saturn_libretro.so"
     addSystem "saturn"

scriptmodules/libretrocores/lr-beetle-supergrafx.sh

@@ -34,7 +34,7 @@ function install_lr-beetle-supergrafx() {
 
 function configure_lr-beetle-supergrafx() {
     mkRomDir "pcengine"
-    ensureSystemretroconfig "pcengine"
+    defaultRAConfig "pcengine"
 
     addEmulator 0 "$md_id" "pcengine" "$md_inst/mednafen_supergrafx_libretro.so"
     addSystem "pcengine"