From: Ian Kelling <iank@fsf.org>
Date: Thu, 17 Feb 2022 19:47:29 +0000 (-0500)
Subject: fixes for python upstream breaking us
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ce8c0f46ae225b00254d0ce313c9d9894643ec3f;p=pdt.git

fixes for python upstream breaking us
---

diff --git a/pdt.sh b/pdt.sh
index c97941e..c0ea98a 100644
--- a/pdt.sh
+++ b/pdt.sh
@@ -190,15 +190,16 @@ pdt-setup() {
 
   if [[ ! -e ~/.local/bin/pip ]]; then
     tmp=$(mktemp)
-    wget -O$tmp https://bootstrap.pypa.io/get-pip.py
+    pyver=$(python3 --version | sed -r 's/.*(3\.[0-9]+).*/\1/')
+    echo fyi: detected pyver: $pyver. this should look something like 3.6
+    # the bootstrap script at https://bootstrap.pypa.io/get-pip.py requires 3.7+
+    # as I write this.
+    wget -O$tmp https://bootstrap.pypa.io/pip/$pyver/get-pip.py
     python3 $tmp --user
     hash -r
   fi
 
-
-  if [[ ! -e ~/.local/bin/virtualenv ]]; then
-    python3 -m pip install --user virtualenv
-  fi
+  python3 -m pip install --user -U virtualenv
 
   cd ~/src/rainbowstream
   python3 -m virtualenv -p python3 venv