Updated Copyright and deleted white spaces at end of line.

This commit is contained in:
Christoph Niethammer 2015-11-05 11:03:02 +00:00
parent 3f321736c8
commit 44990e6e40
3 changed files with 19 additions and 19 deletions

View file

@ -1,9 +1,9 @@
#!/bin/bash -l #!/bin/bash -l
# #
# Christoph Niethammer <niethammer@hlrs.de>, (c) 2012 # Copyright (c) 2012-2015 Christoph Niethammer <niethammer@hlrs.de>
# #
# Script checking the module environment for problems during module loading/unloading # Script checking the module environment for problems during module loading/unloading
# #
# Usage: # Usage:
# check_modules.sh [MODULE] # check_modules.sh [MODULE]
# #
@ -11,10 +11,10 @@
# MODULE May be any valid module path as used for 'module avail [MODULE]' # MODULE May be any valid module path as used for 'module avail [MODULE]'
# #
# Command line options: # Command line options:
moduleclass=$1 # check only subset of modules moduleclass=$1 # check only subset of modules
# definitions for esear color output to display # definitions for esear color output to display
Color_Off='\e[0m' # Text Reset Color_Off='\e[0m' # Text Reset
IGreen='\e[0;92m' # Intense Green IGreen='\e[0;92m' # Intense Green
IRed='\e[0;91m' # Intense Red IRed='\e[0;91m' # Intense Red
@ -24,7 +24,7 @@ LOGDIR=${LOGDIR:=$PWD}
tmpdir=/tmp/check_modules-$USER tmpdir=/tmp/check_modules-$USER
mkdir -p $tmpdir mkdir -p $tmpdir
logfile="$LOGDIR/check_modules.log" # logfile with detailed information logfile="$LOGDIR/check_modules.log" # logfile with detailed information
module_load_logfile="$tmpdir/.module_load.log" # output of 'module load commands module_load_logfile="$tmpdir/.module_load.log" # output of 'module load commands
module_rm_logfile="$tmpdir/.module_rm.log" # output of 'module rm' commands module_rm_logfile="$tmpdir/.module_rm.log" # output of 'module rm' commands
module_clean_env_file="$tmpdir/.module_clean_env" # original environment module_clean_env_file="$tmpdir/.module_clean_env" # original environment
@ -51,17 +51,17 @@ echo "--------------------" >> $logfile
for m_original in $(module av -t $moduleclass 2>&1); do for m_original in $(module av -t $moduleclass 2>&1); do
if [[ $m_original =~ ^[A-Za-z] ]]; then # skip any non module line in output if [[ $m_original =~ ^[A-Za-z] ]]; then # skip any non module line in output
m=$(echo $m_original | sed -e 's/(.*)//') # Remove aliases e.g. (default) m=$(echo $m_original | sed -e 's/(.*)//') # Remove aliases e.g. (default)
echo -n "Checking $m_original ... " echo -n "Checking $m_original ... "
echo "Checking $m_original ... " >> $logfile echo "Checking $m_original ... " >> $logfile
cmd="module load $m" cmd="module load $m"
echo $cmd >> $logfile echo $cmd >> $logfile
$cmd > $module_load_logfile 2>&1 $cmd > $module_load_logfile 2>&1
cat $module_load_logfile >> $logfile cat $module_load_logfile >> $logfile
module li >>$logfile 2>&1 module li >>$logfile 2>&1
# check if module was loaded and did not report errors during loading # check if module was loaded and did not report errors during loading
if module li -t 2>&1 | grep $m >/dev/null && ! grep ERROR $module_load_logfile >/dev/null ; then if module li -t 2>&1 | grep $m >/dev/null && ! grep ERROR $module_load_logfile >/dev/null ; then
cmd="module rm $m" cmd="module rm $m"
echo $cmd >> $logfile echo $cmd >> $logfile
@ -79,7 +79,7 @@ for m_original in $(module av -t $moduleclass 2>&1); do
echo "SUCCESS" >> $logfile echo "SUCCESS" >> $logfile
fi fi
else else
echo -e "${IRed}loading failed${Color_Off}" echo -e "${IRed}loading failed${Color_Off}"
echo "ERROR: loading module '$m' failed" >> $logfile echo "ERROR: loading module '$m' failed" >> $logfile
failed_modules=(${failed_modules[@]} $m) failed_modules=(${failed_modules[@]} $m)
@ -104,7 +104,7 @@ for m_original in $(module av -t $moduleclass 2>&1); do
fi fi
done done
# clean up file storing the initial environment # clean up file storing the initial environment
rm -f $module_clean_env_file rm -f $module_clean_env_file
rm -rf $tmpdir rm -rf $tmpdir

View file

@ -2,8 +2,8 @@
# #
# Script checking the right permissions for software installations: # Script checking the right permissions for software installations:
# Ordinary files must at least have permissions 664 and directories 755. # Ordinary files must at least have permissions 664 and directories 755.
# #
# Christoph Niethammer <niethammer@hlrs.de> (C) 2010-2012 # Copyright (c) 2010-2015 Christoph Niethammer <niethammer@hlrs.de>
# #
declare -r APP_NAME="${0##*/}" declare -r APP_NAME="${0##*/}"
@ -33,7 +33,7 @@ Usage: $APP_NAME DIR
-v, --verbose Be more verbose (print list of found directories and files) -v, --verbose Be more verbose (print list of found directories and files)
--fixit Fix permissions if possible (only working in verbose mode) --fixit Fix permissions if possible (only working in verbose mode)
Checks permissions in the given directories. Permissions for files must be Checks permissions in the given directories. Permissions for files must be
at least set to 664 and for directories must be exactly 775. at least set to 664 and for directories must be exactly 775.
EOF EOF
@ -57,7 +57,7 @@ if [ $# -lt 1 ]; then
exit 0 exit 0
fi fi
for arg in $@; do for arg in $@; do
case $arg in case $arg in
--fixit) --fixit)
FIX_PERMISSIONS=1 FIX_PERMISSIONS=1
@ -88,9 +88,9 @@ for arg in $@; do
esac esac
done done
echo "# Searching for directories which do not match '$DIR_PERMS' ..." echo "# Searching for directories which do not match '$DIR_PERMS' ..."
WRONG_DIRS=(`find $SEARCH_DIRS -type d ! -perm $DIR_PERMS -print`) WRONG_DIRS=(`find $SEARCH_DIRS -type d ! -perm $DIR_PERMS -print`)
echo "# Searching for files which do not match at least '$FILE_PERMS' ..." echo "# Searching for files which do not match at least '$FILE_PERMS' ..."
WRONG_FILES=(`find $SEARCH_DIRS -type f ! -perm -$FILE_PERMS -print`) WRONG_FILES=(`find $SEARCH_DIRS -type f ! -perm -$FILE_PERMS -print`)

View file

@ -1,6 +1,6 @@
#!/usr/bin/env python2.6 #!/usr/bin/env python2.6
# #
# Copyright(c) 2013 Christoph Niethammer <niethammer@hlrs.de> # Copyright(c) 2013-2015 Christoph Niethammer <niethammer@hlrs.de>
# #
import os import os
@ -76,7 +76,7 @@ for logfilename in os.listdir(logdir) :
moduleusers[module][user] = moduleusers[module][user] + 1 moduleusers[module][user] = moduleusers[module][user] + 1
# if ' swap' in line : # if ' swap' in line :
# print line.split() # print line.split()
print "-"*78 print "-"*78
print "Module statistics for " + startdate.strftime('%Y-%m-%d') + " - " + enddate.strftime('%Y-%m-%d') print "Module statistics for " + startdate.strftime('%Y-%m-%d') + " - " + enddate.strftime('%Y-%m-%d')
print "-"*78 print "-"*78