update info output

Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
This commit is contained in:
Thomas Sjögren 2019-08-26 15:13:50 +02:00
parent f2a7e6d6a6
commit d963b93fcc

View file

@ -11,7 +11,7 @@ check_1() {
check_1_1() { check_1_1() {
logit "" logit ""
id_1_1="1_1" id_1_1="1.1"
desc_1_1="General Configuration" desc_1_1="General Configuration"
check_1_1="$id_1_1 - $desc_1_1" check_1_1="$id_1_1 - $desc_1_1"
info "$check_1_1" info "$check_1_1"
@ -45,14 +45,14 @@ check_1_1_2() {
do_version_check "$docker_current_version" "$docker_version" do_version_check "$docker_current_version" "$docker_version"
if [ $? -eq 11 ]; then if [ $? -eq 11 ]; then
info "$check_1_1_2" info "$check_1_1_2"
info " * Using $docker_version, verify is it up to date as deemed necessary" info " * Using $docker_version, verify is it up to date as deemed necessary"
info " * Your operating system vendor may provide support and security maintenance for Docker" info " * Your operating system vendor may provide support and security maintenance for Docker"
resulttestjson "INFO" "Using $docker_version" resulttestjson "INFO" "Using $docker_version"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
else else
pass "$check_1_1_2" pass "$check_1_1_2"
info " * Using $docker_version which is current" info " * Using $docker_version which is current"
info " * Check with your operating system vendor for support and security maintenance for Docker" info " * Check with your operating system vendor for support and security maintenance for Docker"
resulttestjson "PASS" "Using $docker_version" resulttestjson "PASS" "Using $docker_version"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -60,7 +60,7 @@ check_1_1_2() {
check_1_2() { check_1_2() {
logit "" logit ""
id_1_2="1_2" id_1_2="1.2"
desc_1_2="Linux Hosts Specific Configuration" desc_1_2="Linux Hosts Specific Configuration"
check_1_2="$id_1_2 - $desc_1_2" check_1_2="$id_1_2 - $desc_1_2"
info "$check_1_2" info "$check_1_2"
@ -98,7 +98,7 @@ check_1_2_2() {
docker_users=$(getent group docker) docker_users=$(getent group docker)
info "$check_1_2_2" info "$check_1_2_2"
for u in $docker_users; do for u in $docker_users; do
info " * $u" info " * $u"
done done
resulttestjson "INFO" "users" "$docker_users" resulttestjson "INFO" "users" "$docker_users"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
@ -165,7 +165,7 @@ check_1_2_4() {
fi fi
else else
info "$check_1_2_4" info "$check_1_2_4"
info " * Directory not found" info " * Directory not found"
resulttestjson "INFO" "Directory not found" resulttestjson "INFO" "Directory not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -202,7 +202,7 @@ check_1_2_5() {
fi fi
else else
info "$check_1_2_5" info "$check_1_2_5"
info " * Directory not found" info " * Directory not found"
resulttestjson "INFO" "Directory not found" resulttestjson "INFO" "Directory not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -239,7 +239,7 @@ check_1_2_6() {
fi fi
else else
info "$check_1_2_6" info "$check_1_2_6"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -276,7 +276,7 @@ check_1_2_7() {
fi fi
else else
info "$check_1_2_7" info "$check_1_2_7"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -313,7 +313,7 @@ check_1_2_8() {
fi fi
else else
info "$check_1_2_8" info "$check_1_2_8"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -350,7 +350,7 @@ check_1_2_9() {
fi fi
else else
info "$check_1_2_9" info "$check_1_2_9"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -387,7 +387,7 @@ check_1_2_10() {
fi fi
else else
info "$check_1_2_10" info "$check_1_2_10"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -424,7 +424,7 @@ check_1_2_11() {
fi fi
else else
info "$check_1_2_11" info "$check_1_2_11"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi
@ -461,7 +461,7 @@ check_1_2_12() {
fi fi
else else
info "$check_1_2_12" info "$check_1_2_12"
info " * File not found" info " * File not found"
resulttestjson "INFO" "File not found" resulttestjson "INFO" "File not found"
currentScore=$((currentScore + 0)) currentScore=$((currentScore + 0))
fi fi