From d95478281be840f27bcac33a927990beecbe727f Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 21 Jan 2023 18:54:03 +0100
Subject: [PATCH] armbian-next: fix ANSI logs, use reset at strategic places

---
 lib/functions/logging/export-logs.sh | 10 +++++-----
 lib/functions/logging/logging.sh     |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/functions/logging/export-logs.sh b/lib/functions/logging/export-logs.sh
index f878ace89c..38e104041c 100644
--- a/lib/functions/logging/export-logs.sh
+++ b/lib/functions/logging/export-logs.sh
@@ -49,13 +49,13 @@ function export_ansi_logs() {
 	display_alert "Preparing ANSI log from" "${LOGDIR}" "debug"
 
 	declare dim_line_separator
-	dim_line_separator=$(echo -e -n "${gray_color:-}")------------------------------------------------------------------------------------------------------------$(echo -e -n "${normal_color:-}")
+	dim_line_separator=$(echo -e -n "${gray_color:-}")------------------------------------------------------------------------------------------------------------$(echo -e -n "${ansi_reset_color:-}")
 
 	cat <<- ANSI_HEADER > "${target_file}"
 		# Armbian ANSI build logs for ${ARMBIAN_BUILD_UUID} - use "less -SR" to view
-		$(echo -e -n "${bright_blue_color}")# Armbian build at $(LC_ALL=C LANG=C date) on $(hostname || true)
+		$(echo -e -n "${bright_blue_color:-}")# Armbian build at $(LC_ALL=C LANG=C date) on $(hostname || true)$(echo -e -n "${ansi_reset_color}")
 		${dim_line_separator}
-		$(echo -e -n "${bright_blue_color}")# ARGs: ${ARMBIAN_ORIGINAL_ARGV[@]@Q}
+		$(echo -e -n "${bright_blue_color}")# ARGs: ${ARMBIAN_ORIGINAL_ARGV[@]@Q}$(echo -e -n "${ansi_reset_color}")
 		${dim_line_separator}
 	ANSI_HEADER
 
@@ -80,7 +80,7 @@ function export_ansi_logs() {
 	declare -a logfiles_array
 	mapfile -t logfiles_array < <(find "${LOGDIR}" -type f | LC_ALL=C sort -h) # "human" sorting
 
-	prefix_sed_contents="   $(echo -n -e "${tool_color:-}")" # spaces are significant
+	prefix_sed_contents="   $(echo -n -e "${ansi_reset_color}${tool_color:-}")" # spaces are significant
 	declare prefix_sed_cmd="/^-->/!s/^/${prefix_sed_contents}/;"
 
 	declare logfile_full
@@ -95,7 +95,7 @@ function export_ansi_logs() {
 		logfile_title="$(echo "${logfile_base}" | sed -e 's/^[^.]*\.[^.]*\.//')"
 
 		cat <<- ANSI_ONE_LOGFILE >> "${target_file}"
-			$(echo -e -n "${bright_blue_color}")### ${logfile_title} $(echo -e -n "${normal_color}")
+			$(echo -e -n "${bright_blue_color}")### ${logfile_title} $(echo -e -n "${ansi_reset_color}")
 			$(cat "${logfile_full}" | sed -e "${prefix_sed_cmd}")
 			${dim_line_separator}
 		ANSI_ONE_LOGFILE
diff --git a/lib/functions/logging/logging.sh b/lib/functions/logging/logging.sh
index 6bb073796a..c5dca6eafa 100644
--- a/lib/functions/logging/logging.sh
+++ b/lib/functions/logging/logging.sh
@@ -18,6 +18,7 @@ function logging_init() {
 	declare -g bright_red_color="\e[1;31m" red_color="\e[0;31m"
 	declare -g bright_blue_color="\e[1;34m" blue_color="\e[0;34m"
 	declare -g bright_magenta_color="\e[1;35m" magenta_color="\e[0;35m"
+	declare -g ansi_reset_color="\e[0m"
 	declare -g -i logging_section_counter=0 # -i: integer
 	declare -g tool_color="${gray_color}"   # default to gray... (should be ok on terminals, @TODO: I've seen it too dark on a few random screenshots though
 	if [[ "${CI}" == "true" ]]; then        # ... but that is too dark for Github Actions