Don't assume the system python executable is "python". Favour "python3" and fall back.

This commit is contained in:
Dave Page 2022-10-06 12:43:03 +01:00
parent 64d9fd0a0b
commit b519af280b

View File

@ -74,8 +74,16 @@ _create_python_env() {
PATH=${PGADMIN_POSTGRES_DIR}/bin:${PATH}
LD_LIBRARY_PATH=${PGADMIN_POSTGRES_DIR}/lib:${LD_LIBRARY_PATH}
# Figure out what python to use
if which python3 > /dev/null 2>&1
then
SYSTEM_PYTHON_EXE="python3"
else
SYSTEM_PYTHON_EXE="python"
fi
git clone https://github.com/gregneagle/relocatable-python.git "${BUILD_ROOT}/relocatable_python"
PATH=$PATH:/usr/local/pgsql/bin python \
PATH=$PATH:/usr/local/pgsql/bin "${SYSTEM_PYTHON_EXE}" \
"${BUILD_ROOT}/relocatable_python/make_relocatable_python_framework.py" \
--upgrade-pip \
--python-version "${PGADMIN_PYTHON_VERSION}" \