* fix for --check-host routine

* better discovery for systemctl in include_os
* other smaller fixes

sources/bin/check_health.sh

@@ -38,7 +38,7 @@
 
 # ------------------------- CONFIGURATION starts here -------------------------
 # define the version (YYYY-MM-DD)
-typeset -r SCRIPT_VERSION="2019-03-16"
+typeset -r SCRIPT_VERSION="2019-03-22"
 # location of parent directory containing KSH functions/HC plugins
 typeset -r FPATH_PARENT="/opt/hc/lib"
 # location of custom HC configuration files
@@ -658,7 +658,7 @@ typeset FFILE=""
 typeset FSYML=""
 
 # find missing symlinks (do not skip core plug-ins here)
-print "${FPATH}" | tr ':' '\n' | while read -r FDIR
+print "${FPATH}" | tr ':' '\n' 2>/dev/null | while read -r FDIR
 do
     find ${FDIR} -type f -print 2>/dev/null | while read -r FFILE
     do
@@ -675,19 +675,18 @@ do
 done
 
 # find & remove broken symbolic links (do not skip core plug-ins here)
-print "${FPATH}" | tr ':' '\n' | while read -r FDIR
+print "${FPATH}" | tr ':' '\n' 2>/dev/null | while read -r FDIR
 do
     # do not use 'find -type l' here!
     # shellcheck disable=SC2010
-    ls ${FDIR} 2>/dev/null | grep -v "\." | while read -r FSYML
+    ls ${FDIR} 2>/dev/null | grep -v "\." 2>/dev/null | while read -r FSYML
     do
         # check if file is a dead symlink
         if [[ -h "${FDIR}/${FSYML}" ]] && [[ ! -f "${FDIR}/${FSYML}" ]]
         then
             rm -f "${FDIR}/${FSYML}" >/dev/null
             # shellcheck disable=SC2181
-            (( $? == 0 )) && \
+            (( $? == 0 )) && print -u2 "INFO: removed dead symbolic link ${FSYML}"
-                print -u2 "INFO: remove dead symbolic link ${FSYML}"
         fi
     done
 done
@@ -1137,7 +1136,8 @@ HC_LOG="${LOG_DIR}/hc.log"
 # act on HC check(s)
 case ${ARG_ACTION} in
     1)  # check (status) HC(s)
-        print "${ARG_HC}" | tr ',' '\n' | grep -v '^$' | while read -r HC_CHECK
+        print "${ARG_HC}" | tr ',' '\n' 2>/dev/null | grep -v '^$' 2>/dev/null |\
+            while read -r HC_CHECK
         do
             # check for HC (function)
             exists_hc "${HC_CHECK}" && die "cannot find HC: ${HC_CHECK}"
@@ -1160,7 +1160,8 @@ case ${ARG_ACTION} in
         done
         ;;
     2)  # disable HC(s)
-        print "${ARG_HC}" | tr ',' '\n' | grep -v '^$' | while read -r HC_DISABLE
+        print "${ARG_HC}" | tr ',' '\n' 2>/dev/null | grep -v '^$' 2>/dev/null |\
+            while read -r HC_DISABLE
         do
             # check for HC (function)
             exists_hc "${HC_DISABLE}" && die "cannot find HC: ${HC_DISABLE}"
@@ -1177,7 +1178,8 @@ case ${ARG_ACTION} in
         done
         ;;
     3)  # enable HC(s)
-        print "${ARG_HC}" | tr ',' '\n' | grep -v '^$' | while read -r HC_ENABLE
+        print "${ARG_HC}" | tr ',' '\n' 2>/dev/null | grep -v '^$' 2>/dev/null |\
+            while read -r HC_ENABLE
         do
             # check for HC (function)
             exists_hc "${HC_ENABLE}" && die "cannot find HC: ${HC_ENABLE}"
@@ -1206,7 +1208,8 @@ case ${ARG_ACTION} in
         # --check-host handling
         (( ARG_CHECK_HOST == 1 )) && init_check_host
         # execute plug-in(s)
-        print "${ARG_HC}" | tr ',' '\n' | grep -v '^$' | while read -r HC_RUN
+        print "${ARG_HC}" | tr ',' '\n' 2>/dev/null | grep -v '^$' 2>/dev/null |\
+            while read -r HC_RUN
         do
             # re-initialize messages stash (log of failed checks)
             # shellcheck disable=SC2034
@@ -1287,6 +1290,13 @@ case ${ARG_ACTION} in
                 if (( RUN_RC == 0 ))
                 then
                     log "executed HC: ${HC_RUN} [RC=${RUN_RC}]"
+                    # call for display_init with extra code 'OK' because some plugin end
+                    # successfully *without* any entries in $HC_MSG_FILE (so handle_hc will
+                    # never get to display_init())
+                    if (( DO_DISPLAY_INIT == 1 )) &&  [[ ! -s "${HC_MSG_FILE}" ]]
+                    then
+                        display_init "${HC_RUN}" "" "OK"
+                    fi
                 else
                     # call for display_init with extra code 'ERROR'
                     if (( DO_DISPLAY_INIT == 1 ))

sources/lib/core/display_init.sh

@@ -31,7 +31,7 @@
 function display_init
 {
 # ------------------------- CONFIGURATION starts here -------------------------
-typeset _VERSION="2019-03-16"                               # YYYY-MM-DD
+typeset _VERSION="2019-03-22"                               # YYYY-MM-DD
 typeset _SUPPORTED_PLATFORMS="AIX,HP-UX,Linux"              # uname -s match
 # ------------------------- CONFIGURATION ends here ---------------------------
 
@@ -76,6 +76,9 @@ fi
 if [[ -n "${_DISPLAY_MSG_CODE}" ]]
 then
     case "${_DISPLAY_MSG_CODE}" in
+        OK|ok)
+            _DISPLAY_COLOR="${_GREEN}"
+            ;;
         ERROR|error)
             _DISPLAY_COLOR="${_MAGENTA}"
             ;;

sources/lib/core/include_os.sh

@@ -111,13 +111,14 @@ check_platform 'Linux' || {
 
 # default is sysv
 LINUX_INIT="sysv"
-if [[ -r /usr/lib/systemd && -x /usr/bin/systemctl ]]
+if [[ -r /usr/lib/systemd && -n "$(command -v systemctl 2>/dev/null)" ]]
 then
     LINUX_INIT="systemd"
 elif [[ -r /usr/share/upstart ]]
 then
     # shellcheck disable=SC2034
     LINUX_INIT="upstart"
+
 fi
 
 return 0
@@ -218,7 +219,7 @@ _NMCLI_BIN="$(command -v nmcli 2>/dev/null)"
 if [[ -x ${_NMCLI_BIN} && -n "${_NMCLI_BIN}" ]]
 then
     # check for active
-    _HAS_NM=$(nmcli networking 2>/dev/null | grep -c -i "enabled")
+    _HAS_NM=$(nmcli networking 2>/dev/null | grep -c -i "enabled" 2>/dev/null)
 else
     (( ARG_DEBUG > 0 )) && debug "NetworkManager is not active here"
     return 1