Merge 94adb3eca9 into ddf231e377

docker-bench-security.sh

@@ -9,7 +9,6 @@
 # ------------------------------------------------------------------------------
 
 # Load dependencies
-. ./output_lib.sh
 . ./helper_lib.sh
 
 # Setup the paths
@@ -35,6 +34,7 @@ usage () {
   usage: ${myname} [options]
 
   -h           optional  Print this help message
+  -m           optional  Disable colors in output
   -l PATH      optional  Log output in PATH
 EOF
 }
@@ -42,15 +42,20 @@ EOF
 # Get the flags
 # If you add an option here, please
 # remember to update usage() above.
-while getopts hl: args
+outputlib='output_lib.sh'
+
+while getopts hml: args
 do
   case $args in
   h) usage; exit 0 ;;
+  m) outputlib='textout_lib.sh' ;;
   l) logger="$OPTARG" ;;
   *) usage; exit 1 ;;
   esac
 done
 
+. ./${outputlib}
+
 if [ -z "$logger" ]; then
   logger="${myname}.log"
 fi