From f0973863199953a9cf56fcbca810d719dc4943e9 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 22 Jul 2022 12:41:34 -0700 Subject: [PATCH] fixing some lint issues. --- bootstrap-salt.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 1fa7765..c6bb14d 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3550,7 +3550,7 @@ __install_saltstack_debian_repository() { } __install_saltstack_debian_tiamat_repository() { - DEBIAN_RELEASE="$DISTRO_MAJORtiamat__VERSION" + DEBIAN_RELEASE="$DISTRO_MAJOR_VERSION" DEBIAN_CODENAME="$DISTRO_CODENAME" __PY_VERSION_REPO="apt" @@ -4377,7 +4377,7 @@ __install_epel_repository() { # Download latest 'epel-release' package for the distro version directly epel_repo_url="${HTTP_VAL}://dl.fedoraproject.org/pub/epel/epel-release-latest-${DISTRO_MAJOR_VERSION}.noarch.rpm" - yum -y install ${epel_next_repo_url} ${epel_repo_url} + yum -y install "${epel_next_repo_url}" "${epel_repo_url}" _EPEL_REPOS_INSTALLED=$BS_TRUE @@ -8572,8 +8572,9 @@ daemons_running_tiamat() { [ $fname = "master" ] && [ "$_INSTALL_MASTER" -eq $BS_FALSE ] && continue [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue - if [ '$(ps wwwaux | grep -v grep | grep "/opt/saltstack/salt/run/run $fname")' = "" ]; then - echoerror "salt-$fname was not found running" + 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" FAILED_DAEMONS=$((FAILED_DAEMONS + 1)) fi done