diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2017-04-30 18:59:35 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-04-30 18:59:35 +0300 |
| commit | 4ecb9d4d05124b813cd4d7ddcaf5671c2f4c4765 (patch) | |
| tree | 282f5a4e9e3530ada04d00bda3e8ac118cf70bbd /include/helper_show | |
| parent | 5ccd0912cf74f5d3dd07e5ed5fe0e6a30571fbb5 (diff) | |
[bulk change] cleaning up, code enhancements, initialization of variables, and new tests
Diffstat (limited to 'include/helper_show')
| -rw-r--r-- | include/helper_show | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/helper_show b/include/helper_show index c5f20ddd..30289924 100644 --- a/include/helper_show +++ b/include/helper_show @@ -187,11 +187,11 @@ if [ $# -gt 0 ]; then "commands") if [ $# -eq 1 ]; then ${ECHOCMD} "\n${WHITE}Commands:${NORMAL}" - for I in ${COMMANDS}; do - ${ECHOCMD} "lynis ${CYAN}${I}${NORMAL}" + for ITEM in ${COMMANDS}; do + ${ECHOCMD} "lynis ${CYAN}${ITEM}${NORMAL}" done ${ECHOCMD} "" - else + else shift if [ $# -eq 1 ]; then case $1 in @@ -200,7 +200,7 @@ if [ $# -gt 0 ]; then "update") ${ECHOCMD} "No help available yet" ;; *) DisplayError "Unknown argument for 'commands'" esac - else + else shift case $1 in "dockerfile") @@ -223,7 +223,7 @@ if [ $# -gt 0 ]; then 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." - else + else shift if [ $# -eq 1 ]; then TESTID="$1" @@ -255,14 +255,14 @@ if [ $# -gt 0 ]; then ${ECHOCMD} "==========================" ${ECHOCMD} "" ${ECHOCMD} "${WHITE}Commands${NORMAL}:" - for I in ${COMMANDS}; do - ${ECHOCMD} "${CYAN}${I}${NORMAL}" + for ITEM in ${COMMANDS}; do + ${ECHOCMD} "${CYAN}${ITEM}${NORMAL}" done ${ECHOCMD} "" ${ECHOCMD} "Use 'lynis show help ${CYAN}<command>${NORMAL}' to see details" ${ECHOCMD} ""; ${ECHOCMD} "" ${ECHOCMD} "${WHITE}Options${NORMAL}:\n${GRAY}${OPTIONS}${NORMAL}" - else + else shift case $1 in "audit") ${ECHOCMD} "${AUDIT_HELP}" ;; @@ -274,7 +274,7 @@ if [ $# -gt 0 ]; then esac fi ;; - "helpers") for I in ${HELPERS}; do ${ECHOCMD} ${I}; done ;; + "helpers") for ITEM in ${HELPERS}; do ${ECHOCMD} ${ITEM}; done ;; "hostids" | "hostid") ${ECHOCMD} "hostid=${HOSTID}" ${ECHOCMD} "hostid2=${HOSTID2}" @@ -295,7 +295,7 @@ if [ $# -gt 0 ]; then ${ECHOCMD} "OS_VERSION=${OS_VERSION}" ;; "pidfile") ${ECHOCMD} "${PIDFILE}" ;; - "profile" | "profiles") for I in ${PROFILES}; do ${ECHOCMD} ${I}; done ;; + "profile" | "profiles") for ITEM in ${PROFILES}; do ${ECHOCMD} ${ITEM}; done ;; "profiledir") ${ECHOCMD} "${PROFILEDIR}" ;; "plugindir") ${ECHOCMD} "${PLUGINDIR}" ;; "release") ${ECHOCMD} "${PROGRAM_VERSION}-${PROGRAM_RELEASE_TYPE}" ;; @@ -314,7 +314,7 @@ if [ $# -gt 0 ]; then *) ${ECHOCMD} "${RED}Error${NORMAL}: Invalid argument provided to 'lynis show settings'\n\n" ${ECHOCMD} "Suggestions:" - for I in ${SHOW_SETTINGS_ARGS}; do ${ECHOCMD} "lynis show settings ${I}"; done + for ITEM in ${SHOW_SETTINGS_ARGS}; do ${ECHOCMD} "lynis show settings ${ITEM}"; done ExitFatal ;; esac @@ -431,10 +431,10 @@ if [ $# -gt 0 ]; then "?") ${ECHOCMD} "${SHOW_ARGS}" ;; *) ${ECHOCMD} "Unknown argument '${RED}$1${NORMAL}' for lynis show" ;; esac - else +else ${ECHOCMD} "\n ${WHITE}Provide an additional argument${NORMAL}\n\n" - for I in ${SHOW_ARGS}; do - ${ECHOCMD} " lynis show ${BROWN}${I}${NORMAL}" + for ITEM in ${SHOW_ARGS}; do + ${ECHOCMD} " lynis show ${BROWN}${ITEM}${NORMAL}" done ${ECHOCMD} "\n" |