From 055a5c2184e2d6d45df8bead6a576a5be17b51e2 Mon Sep 17 00:00:00 2001 From: Ch3LL Date: Wed, 19 Apr 2017 13:55:09 -0400 Subject: [PATCH] fix lint --- bootstrap-salt.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 45db0ec..67b6491 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -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 }