From d2e6276d357270f1c496c41f9aee43ce4c877495 Mon Sep 17 00:00:00 2001
From: Christoph Niethammer <niethammer@hlrs.de>
Date: Thu, 8 Sep 2016 09:02:13 +0000
Subject: [PATCH] Fixed usage message and output improvements.

---
 check_modules.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/check_modules.sh b/check_modules.sh
index 18d3e1f..0e115d1 100755
--- a/check_modules.sh
+++ b/check_modules.sh
@@ -6,10 +6,8 @@
 #
 
 function print_usage() {
-    echo <<EOT
-Script checking the module environment for problems during module loading/unloading
-usage: $0 [MODULE_PATTERN] [--exclude PATTERN]"
-EOT 
+echo "Script checking the module environment for problems during module loading/unloading"
+echo "usage: $0 [MODULE_PATTERN] [--exclude PATTERN]"
 }
 
 # Command line options:
@@ -38,9 +36,8 @@ done
 Color_Off='\e[0m'       # Text Reset
 IGreen='\e[0;92m'       # Intense Green
 IRed='\e[0;91m'         # Intense Red
+IMagenta='\e[0;95m'     # magenta
 
-            echo Moduleclasses: ${moduleclasses[@]}
-            echo Exclude: ${exclude_patterns[@]}
 # intermediate files, logfiles
 LOGDIR=${LOGDIR:=$PWD}
 tmpdir=/tmp/check_modules-$USER
@@ -66,6 +63,9 @@ echo "Host: $(/bin/hostname)" | tee -a $logfile
 echo "USER: $USER" | tee -a $logfile
 echo "Logfile: $logfile" | tee -a $logfile
 echo "--------------------" | tee -a $logfile
+echo Moduleclasses: ${moduleclasses[@]}  | tee -a $logfile
+echo Exclude: ${exclude_patterns[@]}  | tee -a $logfile
+echo "--------------------" | tee -a $logfile
 echo "Environment:" >> $logfile
 cat $module_clean_env_file >> $logfile
 echo "--------------------" >> $logfile
@@ -77,8 +77,9 @@ do
         for exclude_pattern in ${exclude_patterns[@]}
         do
             if [[ "$m_original" =~ "$exclude_pattern" ]]; then
-                echo MATCH: $exclude_pattern
+                echo -e "Skipping $m_original (matches $exclude_pattern) ... ${IMagenta} skipped${Color_Off}"
                 match=1
+                continue
             fi
         done
         if [ $match == 1 ]; then