From ba0d83ff3fc7f217f7c521eb3f89b8f70a3d0619 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 25 Jul 2022 19:03:32 -0700 Subject: [PATCH] Some lint fixes. --- bootstrap-salt.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 68669f1..d01844b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -8435,9 +8435,10 @@ daemons_running_tiamat() { [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue - salt_path="/opt/saltstack/salt/run/run" - if [ "$(ps wwwaux | grep -v grep | grep $salt_path | grep $fname)" = "" ]; then - echoerror "$salt_process was not found running" + salt_path="/opt/saltstack/salt/run/run ${fname}" + process_running=$(pgrep -f "${salt_path}") + if [ "${process_running}" = "" ]; then + echoerror "${salt_path} was not found running" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi done