From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Jun 2010 22:02:07 +0000 (+0200)
Subject: network: Enhance colour functions.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6dbd51baf02ec0fee6813e9e6f89cf012e28b4a8;p=people%2Farne_f%2Fnetwork.git

network: Enhance colour functions.

Automatically enabled/disable colours.

Add some preset colours.
---

diff --git a/functions b/functions
index fb0fbd6e..c6794481 100644
--- a/functions
+++ b/functions
@@ -11,3 +11,19 @@ network_config_read
 if ! [ -d "${RUN_DIR}" ]; then
 	mkdir ${RUN_DIR}
 fi
+
+# Set colour mode
+case "${COLOURS}" in
+	auto)
+		colours_auto_disable
+		;;
+	off|0)
+		colours_disable
+		;;
+	on|1)
+		# Do nothing
+		;;
+	*)
+		warning_log "Unknown parameter given for COLOURS: ${COLOURS}"
+		;;
+esac
diff --git a/functions.colors b/functions.colors
index 19685bb5..b3c019fb 100644
--- a/functions.colors
+++ b/functions.colors
@@ -19,6 +19,11 @@
 #                                                                             #
 ###############################################################################
 
+COLOUR_GREEN="\\033[1;32m"
+COLOUR_RED="\\033[1;31m"
+COLOUR_NORMAL="\\033[0;39m"
+COLOUR_YELLOW="\\033[1;35m"
+
 # Define color for messages
 BOLD="\\033[1;39m"
 DONE="\\033[1;32m"
@@ -26,3 +31,27 @@ SKIP="\\033[1;34m"
 WARN="\\033[1;35m"
 FAIL="\\033[1;31m"
 NORMAL="\\033[0;39m"
+
+COLOUR_BOLD="\\033[1;39m"
+COLOUR_DOWN=${COLOUR_RED}
+COLOUR_ERROR=${COLOUR_RED}
+COLOUR_OK=${COLOUR_GREEN}
+COLOUR_UP=${COLOUR_GREEN}
+
+COLOUR_STP_FORWARDING=${COLOUR_GREEN}
+COLOUR_STP_DISCARDING=${COLOUR_RED}
+COLOUR_STP_LEARNING=${COLOUR_YELLOW}
+COLOUR_STP_BLOCKING=${COLOUR_YELLOW}
+
+function colours_disable() {
+	local line
+	for line in $(set | grep "^COLOUR_"); do
+		unset ${line%%=*}
+	done
+}
+
+function colours_auto_disable() {
+	if [ "${TERM}" = "dumb" ]; then
+		colours_disable
+	fi
+}
diff --git a/functions.constants b/functions.constants
index 53b191d2..902e4eb4 100644
--- a/functions.constants
+++ b/functions.constants
@@ -20,7 +20,7 @@
 ###############################################################################
 
 # Enable colors by default
-COLORS=1
+COLOURS="auto"
 
 BASE_DIR=/lib/network
 CONFIG_DIR=/etc/network