From f657d87b997f5b599d74a8f2eb6fef8dd6381550 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 17 Apr 2007 09:32:18 +0000
Subject: Rationalise our colour usage a little.

---
 sh/functions.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'sh')

diff --git a/sh/functions.sh b/sh/functions.sh
index 48505c5e..99c937e1 100644
--- a/sh/functions.sh
+++ b/sh/functions.sh
@@ -144,14 +144,7 @@ for arg in "$@" ; do
 done
 
 if [ "${RC_NOCOLOR}" != "yes" -a -z "${GOOD}" ] ; then
-	if color_terminal ; then
-		GOOD=${EINFO_GOOD:-$'\e[32;01m'}
-		WARN=${EINFO_WARN:-$'\e[33;01m'}
-		BAD=${EINFO_BAD:-$'\e[31;01m'}
-		HILITE=${EINFO_HILITE:-$'\e[36;01m'}
-		BRACKET=${EINFO_BRACKET:-$'\e[34;01m'}
-		NORMAL=$'\e[0m'
-	fi
+	eval $(eval_ecolors)
 fi
 
 # vim: set ts=4 :
-- 
cgit v1.2.3