diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-09-03 13:19:55 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-09-03 13:19:55 -0400 |
| commit | 81865b5940395c81a597b3014fcaf33b9a92e9ba (patch) | |
| tree | 3c955b0fec823f675afaf84318f7120a4b2641e4 /scripts | |
| parent | 6c872c71a78ef0b962b160abe313b5685af07bec (diff) | |
| download | kutter-81865b5940395c81a597b3014fcaf33b9a92e9ba.tar.gz kutter-81865b5940395c81a597b3014fcaf33b9a92e9ba.tar.xz kutter-81865b5940395c81a597b3014fcaf33b9a92e9ba.zip | |
install-octopi: Use "virtualenv -p python2" to ensure python2 is selected
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-centos.sh | 2 | ||||
| -rwxr-xr-x | scripts/install-debian.sh | 2 | ||||
| -rwxr-xr-x | scripts/install-octopi.sh | 2 | ||||
| -rwxr-xr-x | scripts/install-ubuntu-18.04.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis-install.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/scripts/install-centos.sh b/scripts/install-centos.sh index 3c39ca47..1c3fd404 100755 --- a/scripts/install-centos.sh +++ b/scripts/install-centos.sh @@ -31,7 +31,7 @@ create_virtualenv() report_status "Updating python virtual environment..." # Create virtualenv if it doesn't already exist - [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} + [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR} # Install/update dependencies ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt diff --git a/scripts/install-debian.sh b/scripts/install-debian.sh index 9b0ea4b4..2cdf5482 100755 --- a/scripts/install-debian.sh +++ b/scripts/install-debian.sh @@ -37,7 +37,7 @@ create_virtualenv() report_status "Updating python virtual environment..." # Create virtualenv if it doesn't already exist - [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} + [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR} # Install/update dependencies ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt diff --git a/scripts/install-octopi.sh b/scripts/install-octopi.sh index 32c42dc9..f768211d 100755 --- a/scripts/install-octopi.sh +++ b/scripts/install-octopi.sh @@ -34,7 +34,7 @@ create_virtualenv() report_status "Updating python virtual environment..." # Create virtualenv if it doesn't already exist - [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} + [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR} # Install/update dependencies ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt diff --git a/scripts/install-ubuntu-18.04.sh b/scripts/install-ubuntu-18.04.sh index 5c391c13..5bcddc39 100755 --- a/scripts/install-ubuntu-18.04.sh +++ b/scripts/install-ubuntu-18.04.sh @@ -36,7 +36,7 @@ create_virtualenv() report_status "Updating python virtual environment..." # Create virtualenv if it doesn't already exist - [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} + [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR} # Install/update dependencies ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt diff --git a/scripts/travis-install.sh b/scripts/travis-install.sh index 1d6c4245..b4ab1e41 100755 --- a/scripts/travis-install.sh +++ b/scripts/travis-install.sh @@ -62,5 +62,5 @@ fi echo -e "\n\n=============== Install python virtualenv\n\n" cd ${MAIN_DIR} -virtualenv ${BUILD_DIR}/python-env +virtualenv ${BUILD_DIR}/python-env -p python2 ${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt |