From f7785f5c4ad09407885d0c0835f7ccef93ff30cc Mon Sep 17 00:00:00 2001 From: Denys Havrysh Date: Mon, 27 Jun 2016 17:26:14 +0300 Subject: [PATCH] Fix race condition when doing one-liner bootstrap --- bootstrap-salt.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 624b881..082aa06 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -19,7 +19,8 @@ set -o nounset # Treat unset variables as an error __ScriptVersion="2016.06.24" -__ScriptName="$(basename "${0}")" +__ScriptName="bootstrap-salt.sh" + __ScriptFullName="${0}" __ScriptArgs="${*}" @@ -6330,7 +6331,7 @@ if [ "$DAEMONS_RUNNING_FUNC" != "null" ] && [ $_START_DAEMONS -eq $BS_TRUE ]; th [ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue if [ "$_ECHO_DEBUG" -eq $BS_FALSE ]; then - echoerror "salt-$fname was not found running. Pass '-D' to $__ScriptName when bootstrapping for additional debugging information..." + echoerror "salt-$fname was not found running. Pass '-D' to ${__ScriptName} when bootstrapping for additional debugging information..." continue fi