From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Sep 2012 19:54:30 +0000 (+0000)
Subject: Completely remove old colour stuff.
X-Git-Tag: 005~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcbf68232779dd9583c0f102a8f7552260a6e5fc;p=network.git

Completely remove old colour stuff.
---

diff --git a/functions.cli b/functions.cli
index 66d7be5a..9e291e41 100644
--- a/functions.cli
+++ b/functions.cli
@@ -270,7 +270,7 @@ function cli_print_warning() {
 	local level=${1}
 	shift
 
-	cli_print ${level} "${COLOUR_WARN}%s${COLOUR_NORMAL}" "$@"
+	cli_print ${level} "${CLR_YELLOW_B}%s${CLR_RESET}" "$@"
 }
 
 function cli_space() {
diff --git a/functions.colors b/functions.colors
index 56684548..7f7e8211 100644
--- a/functions.colors
+++ b/functions.colors
@@ -52,50 +52,6 @@ CLR_WHITE_BG='\e[47m'
 # Reset everything.
 CLR_RESET="\e[0m"
 
-# Legacy color variables.
-COLOUR_GREEN=${CLR_GREEN_B}
-COLOUR_RED=${CLR_RED_B}
-COLOUR_NORMAL=${CLR_RESET_B}
-COLOUR_YELLOW=${CLR_YELLOW_B}
-
-COLOUR_BOLD="\\033[1;39m"
-COLOUR_DOWN=${COLOUR_RED}
-COLOUR_ERROR=${COLOUR_RED}
-COLOUR_OK=${COLOUR_GREEN}
-COLOUR_UP=${COLOUR_GREEN}
-COLOUR_WARN=${COLOUR_YELLOW}
-
-COLOUR_ENABLED=${COLOUR_GREEN}
-COLOUR_DISABLED=${COLOUR_RED}
-
-COLOUR_STP_FORWARDING=${COLOUR_GREEN}
-COLOUR_STP_DISCARDING=${COLOUR_RED}
-COLOUR_STP_LEARNING=${COLOUR_YELLOW}
-COLOUR_STP_BLOCKING=${COLOUR_YELLOW}
-
-COLOUR_VARIABLES="COLOUR_GREEN COLOUR_RED COLOUR_NORMAL COLOUR_YELLOW"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOURBG_GREEN COLOURBG_RED COLOURBG_NORMAL"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOURBG_YELLOW"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_BOLD COLOUR_DOWN COLOUR_ERROR"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_ERROR COLOUR_OK COLOUR_UP"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_WARM COLOUR_ENABLED COLOUR_DISABLED"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_LOG COLOUR_STP_FORWARDING"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_STP_DISCARDING COLOUR_STP_LEARNING"
-COLOUR_VARIABLES="${COLOUR_VARIABLES} COLOUR_STP_BLOCKING"
-
-function colours_disable() {
-	local line
-	for line in ${COLOUR_VARIABLES}; do
-		unset ${line}
-	done
-}
-
-function colours_auto_disable() {
-	if [ "${TERM}" = "dumb" ]; then
-		colours_disable
-	fi
-}
-
 # Predefined messages
 MSG_HOOK_UP="${CLR_GREEN_BG}${CLR_WHITE_B}     UP     ${CLR_RESET}"
 MSG_HOOK_DOWN="${CLR_RED_BG}${CLR_WHITE_B}    DOWN    ${CLR_RESET}"
diff --git a/functions.constants b/functions.constants
index 0165fc72..bb83a16f 100644
--- a/functions.constants
+++ b/functions.constants
@@ -61,14 +61,6 @@ STATUS_UP=0
 STATUS_DOWN=1
 STATUS_NOCARRIER=2
 
-STATUS_TEXT[${STATUS_UP}]="UP"
-STATUS_TEXT[${STATUS_DOWN}]="DOWN"
-STATUS_TEXT[${STATUS_NOCARRIER}]="NO CARRIER"
-
-STATUS_COLOUR[${STATUS_UP}]=${COLOUR_GREEN}
-STATUS_COLOUR[${STATUS_DOWN}]=${COLOUR_RED}
-STATUS_COLOUR[${STATUS_NOCARRIER}]=${COLOUR_YELLOW}
-
 DISCOVER_OK=0
 DISCOVER_ERROR=1
 DISCOVER_NOT_SUPPORTED=2
diff --git a/functions.util b/functions.util
index 872b254c..d8880ff4 100644
--- a/functions.util
+++ b/functions.util
@@ -35,7 +35,7 @@ function args() {
 
 # Print a pretty error message
 function error() {
-	echo -e " ${COLOUR_ERROR}ERROR${COLOUR_NORMAL}  : $@" >&2
+	echo -e " ${CLR_RED_B}ERROR${CLR_RESET}  : $@" >&2
 }
 
 function error_log() {
@@ -44,7 +44,7 @@ function error_log() {
 
 # Print a pretty warn message
 function warning() {
-	echo -e " ${COLOUR_WARN}WARNING${COLOUR_NORMAL}: $@" >&2
+	echo -e " ${CLR_YELLOW_B}WARNING${CLR_RESET}: $@" >&2
 }
 
 function warning_log() {
diff --git a/hooks/ports/bonding b/hooks/ports/bonding
index b24dce02..892e8840 100755
--- a/hooks/ports/bonding
+++ b/hooks/ports/bonding
@@ -157,6 +157,7 @@ function _status() {
         echo "${port}"
 
         local status=$(device_get_status ${port})
+	# XXX STATUS_COLOUR AND STATUS_TEXT DO NOT EXIST ANYMORE
         printf "${DEVICE_PRINT_LINE1}" "Status:" "$(echo -ne ${STATUS_COLOUR[${status}]}${STATUS_TEXT[${status}]}${COLOUR_NORMAL})"
 
         cli_headline "  Ethernet information:"
diff --git a/hooks/zones/wireless b/hooks/zones/wireless
index 23279db0..9af1c4bc 100755
--- a/hooks/zones/wireless
+++ b/hooks/zones/wireless
@@ -129,7 +129,7 @@ function _status() {
 	printf "${DEVICE_PRINT_LINE1}" "Priority:" $(stp_bridge_get_priority ${zone})
 
 	if stp_bridge_is_root ${zone}; then
-		echo -e "    ${COLOUR_BOLD}This bridge is root.${COLOUR_NORMAL}"
+		echo -e "    ${CLR_BLACK_B}This bridge is root.${CLR_RESET}"
 	else
 		printf "${DEVICE_PRINT_LINE1}" "Designated root:" $(stp_bridge_get_designated_root ${zone})
 		printf "${DEVICE_PRINT_LINE1}" "Root path cost:" $(stp_bridge_get_root_path_cost ${zone})
diff --git a/network b/network
index 3c3b1006..61dfcdfa 100755
--- a/network
+++ b/network
@@ -110,10 +110,10 @@ function cli_device_status() {
 
 	case "${status}" in
 		${EXIT_TRUE})
-			status="${COLOUR_GREEN}UP${COLOUR_NORMAL}"
+			status="${CLR_GREEN_B}UP${CLR_RESET}"
 			;;
 		${EXIT_FALSE})
-			status="${COLOUR_RED}DOWN${COLOUR_NORMAL}"
+			status="${CLR_RED_B}DOWN${CLR_RESET}"
 			;;
 	esac