install-octopi: Use "virtualenv -p python2" to ensure python2 is selected

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-03 13:19:55 -04:00
parent 6c872c71a7
commit 81865b5940
5 changed files with 5 additions and 5 deletions

View File

@ -31,7 +31,7 @@ create_virtualenv()
report_status "Updating python virtual environment..." report_status "Updating python virtual environment..."
# Create virtualenv if it doesn't already exist # Create virtualenv if it doesn't already exist
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt

View File

@ -37,7 +37,7 @@ create_virtualenv()
report_status "Updating python virtual environment..." report_status "Updating python virtual environment..."
# Create virtualenv if it doesn't already exist # Create virtualenv if it doesn't already exist
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt

View File

@ -34,7 +34,7 @@ create_virtualenv()
report_status "Updating python virtual environment..." report_status "Updating python virtual environment..."
# Create virtualenv if it doesn't already exist # Create virtualenv if it doesn't already exist
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt

View File

@ -36,7 +36,7 @@ create_virtualenv()
report_status "Updating python virtual environment..." report_status "Updating python virtual environment..."
# Create virtualenv if it doesn't already exist # Create virtualenv if it doesn't already exist
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv -p python2 ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt

View File

@ -62,5 +62,5 @@ fi
echo -e "\n\n=============== Install python virtualenv\n\n" echo -e "\n\n=============== Install python virtualenv\n\n"
cd ${MAIN_DIR} 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 ${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt