Install pip after running setup_distro (Submitty#3145)

* Install pip after running setup_distro This makes pip available for the extra package setup scripts * Don't install pip3 as part of rpi.sh
UCL-RITS · Nov 30, 2018 · c99b355 · c99b355
1 parent e9beb76
commit c99b355
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/.setup/distro_setup/setup_distro.sh b/.setup/distro_setup/setup_distro.sh
@@ -19,6 +19,27 @@ fi
 echo "Setting up distro: ${DISTRO} ${VERSION}"
 source ${CURRENT_DIR}/${DISTRO}/${VERSION}/setup_distro.sh
 
+# Install pip after we've installed python within the setup_distro.sh
+if [ ! -x "$(command -v pip2)" ] || [ ! -x "$(command -v pip3)" ]; then
+    wget --tries=5 https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py
+fi
+
+if [ ! -x "$(command -v pip2)" ]; then
+    python2 /tmp/get-pip.py
+else
+    pip2 install -U pip
+fi
+
+if [ ! -x "$(command -v pip3)" ]; then
+    python3 /tmp/get-pip.py
+else
+    pip3 install -U pip
+fi
+
+if [ -f /tmp/get-pip.py ]; then
+    rm -f /tmp/get-pip.py
+fi
+
 # Read through our arguments to get "extra" packages to install for our distro
 # ${@} are populated by whatever calls install_system.sh which then sources this
 # script.
@@ -86,24 +107,3 @@ ${DISTRO_LINE}
 " > /etc/motd
     chmod +rx /etc/motd
 fi
-
-
-if [ ! -x "$(command -v pip2)" ] || [ ! -x "$(command -v pip3)" ]; then
-    wget --tries=5 https://bootstrap.pypa.io/get-pip.py -O /tmp/get-pip.py
-fi
-
-if [ ! -x "$(command -v pip2)" ]; then
-    python2 /tmp/get-pip.py
-else
-    pip2 install -U pip
-fi
-
-if [ ! -x "$(command -v pip3)" ]; then
-    python3 /tmp/get-pip.py
-else
-    pip3 install -U pip
-fi
-
-if [ -f /tmp/get-pip.py ]; then
-    rm -f /tmp/get-pip.py
-fi
diff --git a/.setup/distro_setup/ubuntu/rpi.sh b/.setup/distro_setup/ubuntu/rpi.sh
@@ -27,7 +27,6 @@ sudo apt-get install -qqy clisp emacs
 echo "Getting pylint..."
 
 # install pylint for python3 using pip
-apt install -qqy python3-pip
 pip3 install pylint
 pip3 install pillow