From 290c65d4b9a57a36cabbd3d5a5cc3ade5aee9fab Mon Sep 17 00:00:00 2001
From: Manuel Streuhofer <manuel@streuhofer.net>
Date: Thu, 1 Dec 2016 18:52:33 +0100
Subject: [PATCH] fix auto-color-off code

turn off colors if NO_COLOR is "true" or TERM is not "xterm*" or STDERR
is not connected to a terminal, but ignore TERM and STDERR if NO_COLOR
is set to "false" explicitly.

Fixes #69
---
 main.sh            | 24 +++++++++++++-----------
 test/acceptance.sh |  5 +++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/main.sh b/main.sh
index 0dfad2b..f57eafe 100755
--- a/main.sh
+++ b/main.sh
@@ -75,9 +75,11 @@ function __b3bp_log () {
   local color="${!colorvar:-$color_error}"
   local color_reset="\x1b[0m"
 
-  if [ "${NO_COLOR}" = "true" ] || [[ "${TERM:-}" != "xterm"* ]] || [ -t 1 ]; then
-    # Don't use colors on pipes or non-recognized terminals
-    color=""; color_reset=""
+  if [ "${NO_COLOR:-}" = "true" ] || [[ "${TERM:-}" != "xterm"* ]] || [ ! -t 2 ]; then
+    if [ "${NO_COLOR:-}" != "false" ]; then
+      # Don't use colors on pipes or non-recognized terminals
+      color=""; color_reset=""
+    fi
   fi
 
   # all remaining arguments are to be printed
@@ -88,14 +90,14 @@ function __b3bp_log () {
   done <<< "${@:-}"
 }
 
-function emergency () {                                $(__b3bp_log emergency "${@}"); exit 1; }
-function alert ()     { [ "${LOG_LEVEL:-0}" -ge 1 ] && $(__b3bp_log alert "${@}"); true; }
-function critical ()  { [ "${LOG_LEVEL:-0}" -ge 2 ] && $(__b3bp_log critical "${@}"); true; }
-function error ()     { [ "${LOG_LEVEL:-0}" -ge 3 ] && $(__b3bp_log error "${@}"); true; }
-function warning ()   { [ "${LOG_LEVEL:-0}" -ge 4 ] && $(__b3bp_log warning "${@}"); true; }
-function notice ()    { [ "${LOG_LEVEL:-0}" -ge 5 ] && $(__b3bp_log notice "${@}"); true; }
-function info ()      { [ "${LOG_LEVEL:-0}" -ge 6 ] && $(__b3bp_log info "${@}"); true; }
-function debug ()     { [ "${LOG_LEVEL:-0}" -ge 7 ] && $(__b3bp_log debug "${@}"); true; }
+function emergency () {                                __b3bp_log emergency "${@}"; exit 1; }
+function alert ()     { [ "${LOG_LEVEL:-0}" -ge 1 ] && __b3bp_log alert "${@}"; true; }
+function critical ()  { [ "${LOG_LEVEL:-0}" -ge 2 ] && __b3bp_log critical "${@}"; true; }
+function error ()     { [ "${LOG_LEVEL:-0}" -ge 3 ] && __b3bp_log error "${@}"; true; }
+function warning ()   { [ "${LOG_LEVEL:-0}" -ge 4 ] && __b3bp_log warning "${@}"; true; }
+function notice ()    { [ "${LOG_LEVEL:-0}" -ge 5 ] && __b3bp_log notice "${@}"; true; }
+function info ()      { [ "${LOG_LEVEL:-0}" -ge 6 ] && __b3bp_log info "${@}"; true; }
+function debug ()     { [ "${LOG_LEVEL:-0}" -ge 7 ] && __b3bp_log debug "${@}"; true; }
 
 function help () {
   echo "" 1>&2
diff --git a/test/acceptance.sh b/test/acceptance.sh
index 6548610..579e5fe 100755
--- a/test/acceptance.sh
+++ b/test/acceptance.sh
@@ -62,6 +62,11 @@ if ! which "${cmdSed}" > /dev/null; then
   exit 1
 fi
 
+# explicitly setting NO_COLOR to false will make b3bp ignore TERM
+# not being "xterm*" and STDERR not being connected to a terminal
+# it's the opposite of NO_COLOR="true" - it forces color, no matter what
+export NO_COLOR="false"
+
 # Running prepare before other scenarios is important on Travis,
 # so that stdio can diverge - and we can enforce stricter
 # stdio comparison on all other tests.