From f7785f5c4ad09407885d0c0835f7ccef93ff30cc Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Mon, 27 Jun 2016 17:26:14 +0300
Subject: [PATCH 1/3] 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 624b88148..082aa0681 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
 

From 395b40f94f9f65e86650cf8480332122d5b30573 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Mon, 27 Jun 2016 09:29:41 -0600
Subject: [PATCH 2/3] Add space back in between 'install' and '--install'

---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 624b88148..8adf01d3a 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2499,7 +2499,7 @@ install_ubuntu_git() {
     if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
         python setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --install-layout=deb || return 1
     else
-        python setup.py ${SETUP_PY_INSTALL_ARGS} install--install-layout=deb || return 1
+        python setup.py ${SETUP_PY_INSTALL_ARGS} install --install-layout=deb || return 1
     fi
     return 0
 }

From 57d87bde316ad6aebbf97a0b8018fa56f1a8ddd1 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Mon, 27 Jun 2016 11:57:11 -0600
Subject: [PATCH 3/3] Update changelog and bootstrap version number

---
 ChangeLog         | 4 ++++
 bootstrap-salt.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index abcec5562..1392859f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 2016.06.27:
+    * Fix race condition when doing one-liner bootstrap
+    * Add space back in between 'install' and '--install'
+
 Version 2016.06.24:
     * Save invocation command and arguments into variables. (jfindlay) #885
     * Update the authors list with new contributors. (rallytime) #884
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index b3c6afa41..60e1fc03d 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -18,7 +18,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2016.06.24"
+__ScriptVersion="2016.06.27"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="${0}"