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

fix lint

Browse source
This commit is contained in:
Ch3LL 2017-04-19 13:55:09 -04:00
parent 47fd79be4c
commit 055a5c2184
No known key found for this signature in database
GPG key ID: E913CB5901E0C81C
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bootstrap-salt.sh
View file

@ -1114,11 +1114,11 @@ __install_python_and_deps() {
if [ $_DISABLE_REPOS -eq $BS_FALSE ]; then
echoinfo "Installing IUS repo"
__yum_install_noinput ${__PYTHON_REPO_URL} || return 1
__yum_install_noinput "${__PYTHON_REPO_URL}" || return 1
fi
echoinfo "Installing ${__PACKAGES}"
__yum_install_noinput ${__PACKAGES} || return 1
__yum_install_noinput "${__PACKAGES}" || return 1
_PIP_PACKAGES="tornado PyYAML msgpack-python jinja2 pycrypto zmq"
__install_pip_pkgs "${_PIP_PACKAGES}" "${_PY_EXE}" || return 1
@ -2279,7 +2279,7 @@ __install_pip_pkgs() {
_py_pkg=$(echo "$_py_exe" | sed -r "s/\.//g")
_pip_cmd="${_py_exe} -m pip"
if [ $_py_exe = "" ]; then
if [ "${_py_exe}" = "" ]; then
_py_exe='python'
fi
@ -2288,10 +2288,12 @@ __install_pip_pkgs() {
# Install pip and pip dependencies
if ! __check_command_exists "${_pip_cmd} --version"; then
__PACKAGES="${_py_pkg}-setuptools ${_py_pkg}-pip gcc ${_py_pkg}-devel"
# shellcheck disable=SC2086
__yum_install_noinput ${__PACKAGES} || return 1
fi
echoinfo "Installing pip packages: ${_pip_pkgs} using ${_py_exe}"
# shellcheck disable=SC2086
${_pip_cmd} install ${_pip_pkgs} || return 1
}