diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-01-12 16:10:55 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-01-12 16:51:49 -0500 |
| commit | 5fc92ff6b7f2c824346fdfd559f2d44978f380ab (patch) | |
| tree | 9319b1ece19c1330946cc578961282273e0feaa1 | |
| parent | 2f8ad5e6ac83c7b3b698ab43bcdf50d5f399f331 (diff) | |
| download | kutter-5fc92ff6b7f2c824346fdfd559f2d44978f380ab.tar.gz kutter-5fc92ff6b7f2c824346fdfd559f2d44978f380ab.tar.xz kutter-5fc92ff6b7f2c824346fdfd559f2d44978f380ab.zip | |
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>
| -rwxr-xr-x | scripts/install-octopi.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |