network: Enhance colour functions.

Automatically enabled/disable colours.

Add some preset colours.

diff --git a/functions b/functions
index fb0fbd6e54378175576bd53c6dcea608af3bf2de..c679448103a419a2b9d7048ea42689ffb960ed54 100644 (file)
--- 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 19685bb53d636d600d377a9fa1d4b20b7db5d49a..b3c019fb9f6d4263a144f50c1b5d60fbdd5b3877 100644 (file)
--- 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 53b191d25fe85eb625ee1eb131d30106fb6a6748..902e4eb43566ea2c21e3c8a6cacc47aefa1ceb38 100644 (file)
--- 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