non colorized output per default. colors via BEE_COLOR='yes'

bee color output is hard to read on terminals with light background. beelib.config honored only [ -t 1 ] . To get colored output don't set BEE_COLOR='no' 8-).
mariux64 · Nov 26, 2015 · 18e4712 · 18e4712
1 parent f4f783f
commit 18e4712
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/bee-list.sh.in b/src/bee-list.sh.in
@@ -81,7 +81,11 @@ function usage() {
 }
 
 function config_init_colors() {
+    : ${BEE_COLOR:="no"}
     if [ -t 1 ] ; then
+        BEE_COLOR='no'
+    fi
+    if [ ${BEE_COLOR} != "no" ] ; then
         COLOR_NORMAL="\\033[0;39m\\033[0;22m"
         COLOR_GREEN="\\033[0;32m"
         COLOR_YELLOW="\\033[0;33m"
@@ -106,9 +110,9 @@ function config_init_colors() {
         COLOR_PURPLE=""
         COLOR_BRACKET=""
         COLOR_BRCONTENT=""
-        COLOR_INFO="**INFO** "
-        COLOR_ERROR="**ERROR** "
-        COLOR_WARN="**WARNING** "
+        COLOR_INFO=""
+        COLOR_ERROR=""
+        COLOR_WARN=""
         COLOR_INSTALLABLE="installable "
         COLOR_UPDATABLE=" updatable "
     fi

diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in
@@ -26,7 +26,11 @@
 : ${BEE_BINDIR:=@BINDIR@}
 
 function config_init_colors() {
+    : ${BEE_COLOR:="no"}
     if [ -t 1 ] ; then
+        BEE_COLOR='no'
+    fi
+    if [ ${BEE_COLOR} != "no" ] ; then
         COLOR_NORMAL="\\033[0;39m\\033[0;22m"
         COLOR_GREEN="\\033[0;32m"
         COLOR_YELLOW="\\033[0;33m"
@@ -49,9 +53,9 @@ function config_init_colors() {
         COLOR_PURPLE=""
         COLOR_BRACKET=""
         COLOR_BRCONTENT=""
-        COLOR_INFO="**INFO** "
-        COLOR_ERROR="**ERROR** "
-        COLOR_WARN="**WARNING** "
+        COLOR_INFO=""
+        COLOR_ERROR=""
+        COLOR_WARN=""
     fi
 }
 
@@ -359,6 +363,7 @@ function config_init() {
     config_load_local_config
     config_load_user_config
     config_load_system_config
+    config_init_colors
     config_verify_builtin_config
     config_verify_builtin_prefixes
     config_handle_deprecated_config