Permalink
Browse files

add nocolor option #321

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
  • Loading branch information...
konstruktoid committed Oct 25, 2018
1 parent 9dd2fa5 commit 2cbfd83f539a366936d905ce2aab7e4dba99502a
Showing with 22 additions and 11 deletions.
  1. +8 −6 docker-bench-security.sh
  2. +14 −5 output_lib.sh
@@ -9,11 +9,6 @@
version='1.3.4'
# Load dependencies
. ./functions_lib.sh
. ./helper_lib.sh
. ./output_lib.sh
# Setup the paths
this_path=$(abspath "$0") ## Path of this file including filename
myname=$(basename "${this_path}") ## file name of this script.
@@ -40,6 +35,7 @@ usage () {
cat <<EOF
usage: ${myname} [options]
-b optional Do not print colors
-h optional Print this help message
-l FILE optional Log output in FILE
-c CHECK optional Comma delimited list of specific check(s)
@@ -52,9 +48,10 @@ EOF
# Get the flags
# If you add an option here, please
# remember to update usage() above.
while getopts hl:c:e:i:x: args
while getopts bhl:c:e:i:x: args
do
case $args in
b) nocolor="nocolor";;
h) usage; exit 0 ;;
l) logger="$OPTARG" ;;
c) check="$OPTARG" ;;
@@ -69,6 +66,11 @@ if [ -z "$logger" ]; then
logger="${myname}.log"
fi
# Load dependencies
. ./functions_lib.sh
. ./helper_lib.sh
. ./output_lib.sh
yell_info
# Warn if not root
@@ -1,9 +1,18 @@
#!/bin/sh
bldred='\033[1;31m'
bldgrn='\033[1;32m'
bldblu='\033[1;34m'
bldylw='\033[1;33m' # Yellow
txtrst='\033[0m'
if ! [ -z "$nocolor" ] && [ "$nocolor" = "nocolor" ]; then
bldred=''
bldgrn=''
bldblu=''
bldylw=''
txtrst=''
else
bldred='\033[1;31m'
bldgrn='\033[1;32m'
bldblu='\033[1;34m'
bldylw='\033[1;33m' # Yellow
txtrst='\033[0m'
fi
logit () {
printf "%b\n" "$1" | tee -a "$logger"

0 comments on commit 2cbfd83

Please sign in to comment.