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 Debian related issue when installing from git

Browse source
This commit is contained in:
Pedro Algarvio 2015-05-07 16:31:21 +01:00
parent 479adb8fb7
commit 1c38687f05
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bootstrap-salt.sh
View file

@ -2379,14 +2379,17 @@ install_debian_git_deps() {
install_debian_6_git_deps() {
install_debian_6_deps || return 1
if [ "$_PIP_ALLOWED" -eq $BS_TRUE ]; then
easy_install -U Jinja2 || return 1
__PACKAGES="build-essential lsb-release python python-dev python-pkg-resources python-crypto"
__PACKAGES="${__PACKAGES} python-m2crypto python-yaml msgpack-python python-pip"
if [ "$(which git)" = "" ]; then
__apt_get_install_noinput git || return 1
__PACKAGES="${__PACKAGES} git"
fi
__apt_get_install_noinput lsb-release python python-pkg-resources python-crypto \
python-m2crypto python-yaml msgpack-python python-pip || return 1
# shellcheck disable=SC2086
__apt_get_install_noinput ${__PACKAGES} || return 1
easy_install -U pyzmq Jinja2 || return 1
__git_clone_and_checkout || return 1
@ -2460,13 +2463,6 @@ install_debian_8_stable() {
}
install_debian_git() {
if [ "$_PIP_ALLOWED" -eq $BS_TRUE ]; then
# Building pyzmq from source to build it against libzmq3.
# Should override current installation
# Using easy_install instead of pip because at least on Debian 6,
# there's no default virtualenv active.
easy_install -U pyzmq || return 1
fi
if [ -f "${__SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
python setup.py install --install-layout=deb --salt-config-dir="$_SALT_ETC_DIR" || return 1