saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'stable'

Browse source
This commit is contained in:
rallytime 2016-06-27 12:02:31 -06:00
commit 012ea0c264
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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

9
bootstrap-salt.sh
View file

@ -18,8 +18,9 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2016.06.24"
__ScriptName="$(basename "${0}")"
__ScriptVersion="2016.06.27"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="${0}"
__ScriptArgs="${*}"
@ -2499,7 +2500,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
}
@ -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