Fix blank lines on terminals with black background.

diff --git a/functions.colors b/functions.colors
index 899382ffecd22cf6e357e517bd32b29fd477a992..5668454831f8958e307b7e316d9f2ac49c0ba68d 100644 (file)
--- a/functions.colors
+++ b/functions.colors
@@ -28,7 +28,6 @@ CLR_BLUE_R='\e[0;34m'
 CLR_PURPLE_R='\e[0;35m'
 CLR_CYAN_R='\e[0;36m'
 CLR_WHITE_R='\e[0;37m'
-CLR_RESET_R='\e[0;39m'
 
 # Bold colours
 CLR_BLACK_B='\e[1;30m'
@@ -39,7 +38,6 @@ CLR_BLUE_B='\e[1;34m'
 CLR_PURPLE_B='\e[1;35m'
 CLR_CYAN_B='\e[1;36m'
 CLR_WHITE_B='\e[1;37m'
-CLR_RESET_B=${CLR_RESET_R}
 
 # Background colors
 CLR_BLACK_BG='\e[40m'
@@ -50,10 +48,9 @@ CLR_BLUE_BG='\e[44m'
 CLR_PURPLE_BG='\e[45m'
 CLR_CYAN_BG='\e[46m'
 CLR_WHITE_BG='\e[47m'
-CLR_RESET_BG='\e[49m'
 
 # Reset everything.
-CLR_RESET_ALL="${CLR_RESET_R}${CLR_RESET_B}${CLR_RESET_BG}"
+CLR_RESET="\e[0m"
 
 # Legacy color variables.
 COLOUR_GREEN=${CLR_GREEN_B}
@@ -100,16 +97,16 @@ function colours_auto_disable() {
 }
 
 # Predefined messages
-MSG_HOOK_UP="${CLR_GREEN_BG}${CLR_WHITE_B}     UP     ${CLR_RESET_B}${CLR_RESET_BG}"
-MSG_HOOK_DOWN="${CLR_RED_BG}${CLR_WHITE_B}    DOWN    ${CLR_RESET_B}${CLR_RESET_BG}"
+MSG_HOOK_UP="${CLR_GREEN_BG}${CLR_WHITE_B}     UP     ${CLR_RESET}"
+MSG_HOOK_DOWN="${CLR_RED_BG}${CLR_WHITE_B}    DOWN    ${CLR_RESET}"
 
-MSG_DEVICE_STATUS_UNKNOWN="${CLR_GREY_BG}${CLR_BLACK_B}  UNKNOWN   ${CLR_RESET_ALL}"
-MSG_DEVICE_STATUS_UP="${CLR_GREEN_BG}${CLR_WHITE_B}     UP     ${CLR_RESET_ALL}"
-MSG_DEVICE_STATUS_DOWN="${CLR_RED_BG}${CLR_WHITE_B}    DOWN    ${CLR_RESET_ALL}"
-MSG_DEVICE_STATUS_NOCARRIER="${CLR_YELLOW_BG}${CLR_WHITE_B} NO-CARRIER ${CLR_RESET_ALL}"
+MSG_DEVICE_STATUS_UNKNOWN="${CLR_GREY_BG}${CLR_BLACK_B}  UNKNOWN   ${CLR_RESET}"
+MSG_DEVICE_STATUS_UP="${CLR_GREEN_BG}${CLR_WHITE_B}     UP     ${CLR_RESET}"
+MSG_DEVICE_STATUS_DOWN="${CLR_RED_BG}${CLR_WHITE_B}    DOWN    ${CLR_RESET}"
+MSG_DEVICE_STATUS_NOCARRIER="${CLR_YELLOW_BG}${CLR_WHITE_B} NO-CARRIER ${CLR_RESET}"
 
-MSG_STP_FORWARDING="${CLR_GREEN_BG}${CLR_WHITE_B} FORWARDING ${CLR_RESET_ALL}"
-MSG_STP_DISCARDING="${CLR_RED_BG}${CLR_WHITE_B} DISCARDING ${CLR_RESET_ALL}"
-MSG_STP_LEARNING="${CLR_YELLOW_BG}${CLR_WHITE_B}  LEARNING   ${CLR_RESET_ALL}"
-MSG_STP_LISTENING="${CLR_YELLOW_BG}${CLR_WHITE_B}  LISTENING  ${CLR_RESET_ALL}"
-MSG_STP_BLOCKING="${CLR_RED_BG}${CLR_WHITE_B}  BLOCKING   ${CLR_RESET_ALL}"
+MSG_STP_FORWARDING="${CLR_GREEN_BG}${CLR_WHITE_B} FORWARDING ${CLR_RESET}"
+MSG_STP_DISCARDING="${CLR_RED_BG}${CLR_WHITE_B} DISCARDING ${CLR_RESET}"
+MSG_STP_LEARNING="${CLR_YELLOW_BG}${CLR_WHITE_B}  LEARNING   ${CLR_RESET}"
+MSG_STP_LISTENING="${CLR_YELLOW_BG}${CLR_WHITE_B}  LISTENING  ${CLR_RESET}"
+MSG_STP_BLOCKING="${CLR_RED_BG}${CLR_WHITE_B}  BLOCKING   ${CLR_RESET}"

diff --git a/functions.logging b/functions.logging
index ce0a95648fc71ea8282ac16109f13a481d7138be..cb44efe71fdcd923ec87eeb7dbf1bf4c334b9320 100644 (file)
--- a/functions.logging
+++ b/functions.logging
@@ -61,7 +61,6 @@ function log() {
                        colour="${CLR_CYAN_R}"
                        ;;
                INFO)
-                       colour="${CLR_BLACK_R}"
                        console="1"
                        ;;
                WARNING)
@@ -74,10 +73,10 @@ function log() {
 
        case "${console}" in
                1)
-                       printf "${colour}${message}${CLR_RESET_ALL}\n"
+                       printf "${colour}${message}${CLR_RESET}\n"
                        ;;
                2)
-                       printf "${colour}${message}${CLR_RESET_ALL}\n" >&2
+                       printf "${colour}${message}${CLR_RESET}\n" >&2
                        ;;
        esac
 }