From fa11a5d7ec8011585ae22b3f6bc735fc53ccc1b1 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 21 Jun 2021 20:13:02 +0300 Subject: [PATCH] setup-ubuntu.sh: install pip2 after everything else --- scripts/setup-ubuntu.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 4e24a4f2d7..51a0cf3dc7 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -200,11 +200,6 @@ else SUDO="sudo" fi -# Pip for python2. -curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py -$SUDO python2 /tmp/py2-get-pip.py -rm -f /tmp/py2-get-pip.py - # Allow 32-bit packages. $SUDO dpkg --add-architecture i386 $SUDO apt-get -yq update @@ -212,6 +207,11 @@ $SUDO apt-get -yq update $SUDO DEBIAN_FRONTEND=noninteractive \ apt-get install -yq --no-install-recommends $PACKAGES +# Pip for python2. +curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py +$SUDO python2 /tmp/py2-get-pip.py +rm -f /tmp/py2-get-pip.py + $SUDO locale-gen --purge en_US.UTF-8 echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale