From 5fc92ff6b7f2c824346fdfd559f2d44978f380ab Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Sun, 12 Jan 2020 16:10:55 -0500
Subject: [PATCH] scripts: Disable "virtualenv setuptools" in install-octopi.sh
 script

The default setuptools installed by virtaulenv has dropped support for
python2.  Explicitly remove it from the installation.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 scripts/install-octopi.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install-octopi.sh b/scripts/install-octopi.sh
index bec01d1a..dc0aebc7 100755
--- a/scripts/install-octopi.sh
+++ b/scripts/install-octopi.sh
@@ -34,7 +34,8 @@ create_virtualenv()
     report_status "Updating python virtual environment..."
 
     # Create virtualenv if it doesn't already exist
-    [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
+    [ ! -d ${PYTHONDIR} ] && virtualenv --no-setuptools ${PYTHONDIR}
+    [ ! -x ${PYTHONDIR}/bin/pip ] && virtualenv ${PYTHONDIR}
 
     # Install/update dependencies
     ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt