From 91c6314a1a457ee755268dcaf365544ca156a1dd Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Mon, 27 Aug 2018 14:51:28 +0200 Subject: [PATCH] Minor cleanups --- include/functions | 5 +---- include/helper_show | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/functions b/include/functions index 951ebae7..e4776ed8 100644 --- a/include/functions +++ b/include/functions @@ -2994,7 +2994,6 @@ ViewCategories() { for CATEGORY in ${TEST_AVAILABLE_CATEGORIES}; do echo "${CATEGORY}"; done - echo "" ExitClean } @@ -3009,13 +3008,11 @@ ################################################################################ ViewGroups() { - if [ ! "${INCLUDEDIR}" = "" ]; then - InsertSection "Available test groups" + if [ ! -z "${INCLUDEDIR}" ]; then for I in $(ls ${INCLUDEDIR}/tests_* | xargs -n 1 basename | sed 's/tests_//' | grep -v "custom.template"); do echo "${I}" done fi - echo "" ExitClean } diff --git a/include/helper_show b/include/helper_show index 95e68ef0..645d972d 100644 --- a/include/helper_show +++ b/include/helper_show @@ -218,7 +218,7 @@ if [ $# -gt 0 ]; then "details") if [ -z "${LOGFILE}" ]; then DisplayError "Could not find log file to parse"; fi if [ $# -eq 1 ]; then - DisplayError "This command needs a test ID (e.g. CORE-1000) to search for." + DisplayError "This command needs a test ID (e.g. CORE-1000) to search for. This command is used after a scan (lynis audit system). Run 'lynis show tests' to see all available tests." else shift if [ $# -eq 1 ]; then @@ -433,8 +433,8 @@ else ${ECHOCMD} " lynis show ${BROWN}${ITEM}${NORMAL}" done ${ECHOCMD} "\n" - - ${ECHOCMD} "Use '$0 show commands show' for extended help about the show command" + ${ECHOCMD} "" + ${ECHOCMD} "Extended help about the show command can be provided with: $0 show commands show" fi