diff options
| author | devcurmudgeon <paul.sherwood@codethink.co.uk> | 2017-01-22 12:58:50 +0000 |
|---|---|---|
| committer | devcurmudgeon <paul.sherwood@codethink.co.uk> | 2017-01-22 12:58:50 +0000 |
| commit | abd0dbbacd9cdc0b9d8047aa350d599e0b06ab8e (patch) | |
| tree | d8e7d2c80c87324d742046e702ade9ae32eec6ae | |
| parent | 1b4189def27e7a76a26b71b02eb932ae0966676b (diff) | |
| parent | bfb264cf872d7962a99db0db6fcd0501c139532c (diff) | |
| download | ybd-abd0dbbacd9cdc0b9d8047aa350d599e0b06ab8e.tar.gz | |
Merge branch 'jjardon/pip_improvements' into 'master'
install_dependencies.sh: Install python-pip from the distro packages
See merge request !288
| -rwxr-xr-x | install_dependencies.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/install_dependencies.sh b/install_dependencies.sh index 3a5b3e6..a2f556c 100755 --- a/install_dependencies.sh +++ b/install_dependencies.sh @@ -32,7 +32,7 @@ installed=false which apt-get 2>&1 > /dev/null if [ $? -eq 0 ]; then $SUDO apt-get -qq update - $SUDO apt-get -qq install build-essential gawk git m4 wget + $SUDO apt-get -qq install build-essential gawk git m4 wget python-pip if [ $? -ne 0 ]; then echo "Install failed" exit 1 @@ -43,7 +43,7 @@ fi # install for fedora which dnf 2>&1 > /dev/null if [ $? -eq 0 ] && [ $installed = false ]; then - $SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python + $SUDO dnf install -y which make automake gcc gcc-c++ gawk git m4 wget python python-pip if [ $? -ne 0 ]; then echo "Install failed" exit 1 @@ -54,7 +54,7 @@ fi # install for aws which yum 2>&1 > /dev/null if [ $? -eq 0 ] && [ $installed = false ]; then - $SUDO yum install -y which make automake gcc gcc-c++ gawk git m4 wget python + $SUDO yum install -y which make automake gcc gcc-c++ gawk git m4 wget python python-pip if [ $? -ne 0 ]; then echo "Install failed" exit 1 @@ -65,7 +65,7 @@ fi # install for Arch which pacman 2>&1 > /dev/null if [ $? -eq 0 ] && [ $installed = false ]; then - $SUDO pacman -S --noconfirm which make automake gcc gawk git m4 wget python2 + $SUDO pacman -S --noconfirm which make automake gcc gawk git m4 wget python2 python2-pip if [ $? -ne 0 ]; then echo "Install failed" exit 1 @@ -78,12 +78,6 @@ if [ $installed = false ]; then exit 1 fi -pip --version 2>&1 > /dev/null -if [ $? -ne 0 ]; then - wget https://bootstrap.pypa.io/get-pip.py - chmod +x get-pip.py - $SUDO ./get-pip.py - $SUDO rm get-pip.py -fi +pip install -U pip $SUDO pip install -r requirements.freeze.txt |