From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 8 May 2020 19:18:49 +0000 (+0200)
Subject: - drop setting color to white as default, use color reset instead
X-Git-Tag: 0.5.3~4
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=5d89b49a413e24dae01d41cdb0d50b919ad4830e;p=rc-scripts.git

- drop setting color to white as default, use color reset instead
---

diff --git a/lib/functions b/lib/functions
index fb41ffa..8f08dc6 100644
--- a/lib/functions
+++ b/lib/functions
@@ -39,7 +39,6 @@ BLUE=4
 MAGENTA=5
 CYAN=6
 WHITE=7
-NORMAL=15
 # Bold definition (second parameter to termput setaf)
 BOLD=1
 NOBOLD=0
@@ -53,7 +52,7 @@ CTLD="$GREEN"		# "TLD Linux" color
 CI="$RED"		# Capital I color (press I to enter interactive startup)
 CRESMAN="$GREEN"	# "Resource Manager" color
 CHARS=""		# Characters displayed on the beginning of show line
-CCHARS="$NORMAL"	# Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
+CCHARS="$WHITE"		# Color of these characters (look at /etc/sysconfig/init-colors.gentoo example)
 
 # Source configuration if available - may override default values
 [ -r /etc/sysconfig/init-colors ] && . /etc/sysconfig/init-colors
@@ -283,7 +282,7 @@ termput() {
 			is_yes "$COLOR_INIT" && echo -ne "\033[${ISBOLD};3${2}m"
 			;;
 		op)
-			termput setaf $NORMAL
+			echo -ne "\033[0m"
 			;;
 		esac
 	else
@@ -296,7 +295,7 @@ termput() {
 			is_yes "$COLOR_INIT" && tput setaf "$2"
 			;;
 		op)
-			termput setaf $NORMAL
+			tput sgr0
 			;;
 		esac
 	fi
diff --git a/sysconfig/init-colors b/sysconfig/init-colors
index 1632fdb..8798b96 100644
--- a/sysconfig/init-colors
+++ b/sysconfig/init-colors
@@ -9,4 +9,4 @@ CTLD="$GREEN"		# "TLD Linux" color
 CI="$RED"		# Capital I color (press I to enter interactive startup)
 CRESMAN="$GREEN"	# "Resource Manager" color
 CHARS=""		# Characters displayed on the beginning of show line
-CCHARS="$NORMAL"	# Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)
+CCHARS="$WHITE"		# Color of these characters (look at /usr/share/doc/rc-scripts-*/init-colors.gentoo.gz example)