From 74fec2e9fa0ada149e52c2e2845cbbd11de87e1a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 28 Nov 2024 15:01:21 +0900 Subject: [PATCH] LOGGER: fixed blank newlines --- functions/global.sh | 3 ++- functions/other_functions.sh | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/functions/global.sh b/functions/global.sh index 0488a22b..e8a19d80 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -54,7 +54,8 @@ cooker_repository_name="Cooker" main_repository_name="RetroDECK" # The name of the main repository under RetroDECK organization features="$config/retrodeck/reference_lists/features.json" # A file where all the RetroDECK and component capabilities are kept for querying es_systems="/app/share/es-de/resources/systems/linux/es_systems.xml" # ES-DE supported system list -es_find_rules="/app/share/es-de/resources/systems/linux/es_find_rules.xml" # ES-DE emulator find rules +es_find_rules="/app/share/es-de/resources/systems/linux/es_find_rules.xml" # ES-DE emulator find rules +logging_level="info" # Initializing this to avoid printing blank newlines, this will be actually red later from the config file # Godot data transfer temp files diff --git a/functions/other_functions.sh b/functions/other_functions.sh index f249d8d8..2198a761 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -205,16 +205,16 @@ conf_read() { do if [[ (! -z "$current_setting_line") && (! "$current_setting_line" == "#"*) && (! "$current_setting_line" == "[]") ]]; then # If the line has a valid entry in it if [[ ! -z $(grep -o -P "^\[.+?\]$" <<< "$current_setting_line") ]]; then # If the line is a section header - local current_section=$(sed 's^[][]^^g' <<< $current_setting_line) # Remove brackets from section name + local current_section=$(sed 's^[][]^^g' <<< "$current_setting_line") # Remove brackets from section name else if [[ "$current_section" == "" || "$current_section" == "paths" || "$current_section" == "options" ]]; then - local current_setting_name=$(get_setting_name "$current_setting_line" "retrodeck") # Read the variable name from the current line - local current_setting_value=$(get_setting_value "$rd_conf" "$current_setting_name" "retrodeck" "$current_section") # Read the variables value from retrodeck.cfg + local current_setting_name=$(cut -d'=' -f1 <<< "$current_setting_line" | xargs) # Extract name + local current_setting_value=$(cut -d'=' -f2 <<< "$current_setting_line" | xargs) # Extract value declare -g "$current_setting_name=$current_setting_value" # Write the current setting name and value to memory fi fi fi - done < $rd_conf + done < "$rd_conf" } conf_write() {