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

correct install location

Browse source
This commit is contained in:
Jeff Neel 2021-01-07 15:09:11 -06:00 • committed by Pedro Algarvio
parent 9e385fbe15
commit b5417e74cc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bootstrap-salt.sh
View file

@ -4217,6 +4217,14 @@ install_centos_stable_deps() {
__PACKAGES="${__PACKAGES} PyYAML" __PACKAGES="${__PACKAGES} PyYAML"
fi fi
fi fi
else
if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq 3 ]; then
if [ "$DISTRO_MAJOR_VERSION" -ge 8 ]; then
__PACKAGES="${__PACKAGES} python3-setuptools"
else
__PACKAGES="${__PACKAGES} python36-setuptools"
fi
fi
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
@ -4351,7 +4359,6 @@ install_centos_git_deps() {
__PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto" __PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto"
fi fi
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-setuptools"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-msgpack python${PY_PKG_VER}-requests"
__PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq" __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado python${PY_PKG_VER}-zmq"