Port bootstrapper fixes to the new le-auto's bootstrappers.

This commit is contained in:
Erik Rose 2016-01-22 15:18:33 -05:00
parent 30db2372b5
commit 55dba783c0
2 changed files with 14 additions and 4 deletions

View file

@ -213,6 +213,7 @@ BootstrapRpmCommon() {
# Tested with:
# - Fedora 22, 23 (x64)
# - Centos 7 (x64: on DigitalOcean droplet)
# - CentOS 7 Minimal install in a Hyper-V VM
if type dnf 2>/dev/null
then
@ -231,12 +232,16 @@ BootstrapRpmCommon() {
if ! $SUDO $tool install -y \
python \
python-devel \
python-virtualenv
python-virtualenv \
python-tools \
python-pip
then
if ! $SUDO $tool install -y \
python27 \
python27-devel \
python27-virtualenv
python27-virtualenv \
python27-tools \
python27-pip
then
echo "Could not install Python dependencies. Aborting bootstrap!"
exit 1

View file

@ -2,6 +2,7 @@ BootstrapRpmCommon() {
# Tested with:
# - Fedora 22, 23 (x64)
# - Centos 7 (x64: on DigitalOcean droplet)
# - CentOS 7 Minimal install in a Hyper-V VM
if type dnf 2>/dev/null
then
@ -20,12 +21,16 @@ BootstrapRpmCommon() {
if ! $SUDO $tool install -y \
python \
python-devel \
python-virtualenv
python-virtualenv \
python-tools \
python-pip
then
if ! $SUDO $tool install -y \
python27 \
python27-devel \
python27-virtualenv
python27-virtualenv \
python27-tools \
python27-pip
then
echo "Could not install Python dependencies. Aborting bootstrap!"
exit 1