From 70cb7f82d65ceaed61b57abb135d727a838801c1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 16 Dec 2014 14:39:56 +0000 Subject: [PATCH] Better scope --- bootstrap-salt.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index a7a7b5e..bc6c5eb 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2732,14 +2732,13 @@ install_centos_git_post() { if [ -f /bin/systemctl ]; then if [ ! -f /usr/lib/systemd/system/salt-${fname}.service ] || ([ -f /usr/lib/systemd/system/salt-${fname}.service ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then copyfile "${__SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" /usr/lib/systemd/system/ - - # Skip salt-api since the service should be opt-in and not necessarily started on boot - [ $fname = "api" ] && continue - - /bin/systemctl enable salt-${fname}.service - SYSTEMD_RELOAD=$BS_TRUE fi - continue + + # Skip salt-api since the service should be opt-in and not necessarily started on boot + [ $fname = "api" ] && continue + + /bin/systemctl enable salt-${fname}.service + SYSTEMD_RELOAD=$BS_TRUE elif [ ! -f /etc/init.d/salt-$fname ] || ([ -f /etc/init.d/salt-$fname ] && [ $_FORCE_OVERWRITE -eq $BS_TRUE ]); then copyfile "${__SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}" /etc/init.d/