formatting

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
This commit is contained in:
Thomas Sjögren 2018-05-10 15:41:27 +02:00
commit 11230d052e
2 changed files with 70 additions and 68 deletions

View file

@ -15,9 +15,13 @@ version='1.3.4'
. ./output_lib.sh
# Setup the paths
this_path=$(abspath "$0") ## Path of this file including filenamel
this_path=$(abspath "$0") ## Path of this file including filename
myname=$(basename "${this_path}") ## file name of this script.
readonly version
readonly this_path
readonly myname
export PATH=/bin:/sbin:/usr/bin:/usr/local/bin:/usr/sbin/
# Check for required program(s)
@ -68,8 +72,8 @@ yell_info
# Warn if not root
ID=$(id -u)
if [ "x$ID" != "x0" ]; then
warn "Some tests might require root to run"
sleep 3
warn "Some tests might require root to run"
sleep 3
fi
# Total Score
@ -112,15 +116,14 @@ main () {
running_containers=1
fi
for test in tests/*.sh
do
. ./"$test"
for test in tests/*.sh; do
. ./"$test"
done
if [ -z "$check" ] && [ ! "$checkexclude" ] ; then
if [ -z "$check" ] && [ ! "$checkexclude" ]; then
cis
elif [ -z "$check" ] && [ "$checkexclude" ]; then
checkexcluded="$(echo $checkexclude | sed 's/,/|/g')"
checkexcluded="$(echo "$checkexclude" | sed 's/,/|/g')"
for c in $(grep 'check_[0-9]_' functions_lib.sh | grep -vE "$checkexcluded"); do
"$c"
done