Add command line option for removing colored output

Jarmo Pertman · Jarmo Pertman · commit 54678fb7730f · 2022-03-23T12:50:09.000+02:00
diff --git a/candalf.sh b/candalf.sh
@@ -7,6 +7,7 @@ Usage: $(basename "$0") [-v | --verbose] [-d | --dry-run] SERVER SPELL_BOOK...
 Options:
   -d --dry-run   do not cast any spells, but show what would be casted
   -v --verbose   enable verbose output
+  -n --no-color  disable colored output
   -h --help      show this help
 
 Examples:
@@ -22,7 +23,9 @@ if [[ ${#} -eq 0 ]]; then
  usage
 fi
 
-optspec=":dvh-:"
+COLOR_RESET="\\033[0;0m"
+
+optspec=":dvnh-:"
 while getopts "$optspec" optchar; do
   case "${optchar}" in
     -)
@@ -33,6 +36,9 @@ while getopts "$optspec" optchar; do
         verbose)
           VERBOSE=1
           ;;
+        no-color)
+          NO_COLOR=$COLOR_RESET
+          ;;
         help)
           usage
           ;;
@@ -48,6 +54,9 @@ while getopts "$optspec" optchar; do
     v)
       VERBOSE=1
       ;;
+    n)
+      NO_COLOR=$COLOR_RESET
+      ;;
     h)
       usage
       ;;
@@ -64,6 +73,7 @@ VERBOSE="${VERBOSE:-""}"
 test $VERBOSE && set -x
 set -Eeuo pipefail
 
+export CANDALF_NO_COLOR="${NO_COLOR:-""}"
 export CANDALF_DRY_RUN="${DRY_RUN:-""}"
 CANDALF_ROOT=$(dirname "$(realpath "$0")")
 CANDALF_SERVER=${1:?"SERVER not set!"}
diff --git a/lib/cast.sh b/lib/cast.sh
@@ -8,14 +8,15 @@ set -Eeuo pipefail
 . "$CANDALF_ROOT"/lib/candalf-env.sh
 eval "$(candalfEnv)"
 
-COLOR_RED='\033[0;31m'
-COLOR_GREEN='\033[0;32m'
-COLOR_GREEN_BG='\033[0;42m'
-COLOR_YELLOW='\033[0;33m'
-COLOR_YELLOW_BG='\033[0;43m'
-COLOR_MAGENTA='\033[0;35m'
-COLOR_GREY='\033[0;90m'
-COLOR_END='\033[0m'
+CANDALF_NO_COLOR="${CANDALF_NO_COLOR:-""}"
+COLOR_RED="${CANDALF_NO_COLOR:-"\\033[0;31m"}"
+COLOR_GREEN="${CANDALF_NO_COLOR:-"\\033[0;32m"}"
+COLOR_GREEN_BG="${CANDALF_NO_COLOR:-"\\033[0;42m"}"
+COLOR_YELLOW="${CANDALF_NO_COLOR:-"\\033[0;33m"}"
+COLOR_YELLOW_BG="${CANDALF_NO_COLOR:-"\\033[0;43m"}"
+COLOR_MAGENTA="${CANDALF_NO_COLOR:-"\\033[0;35m"}"
+COLOR_GREY="${CANDALF_NO_COLOR:-"\\033[0;90m"}"
+COLOR_END="${CANDALF_NO_COLOR:-"\\033[0;0m"}"
 
 function cast() {
   SPELL_FILE="${1:?"SPELL_FILE not set!"}"
