From 1a690e94e3e7f876bdc7df11531bf0a256790cde Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 7 May 2021 08:40:54 +0200 Subject: [PATCH] Fix python3 symlink --- common.debian | 2 ++ common.docker | 2 +- imagefiles/build-and-install-ninja.sh | 2 +- imagefiles/install-python-packages.sh | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common.debian b/common.debian index ae85527..a8965b4 100644 --- a/common.debian +++ b/common.debian @@ -42,3 +42,5 @@ RUN \ libtool-doc \ && \ apt-get clean --yes +# Add symlink for compatibility +RUN ln -s /usr/bin/python3 /usr/bin/python diff --git a/common.docker b/common.docker index 62a36c6..9177445 100644 --- a/common.docker +++ b/common.docker @@ -25,7 +25,7 @@ RUN \ /buildscripts/build-and-install-git.sh && \ /buildscripts/install-cmake-binary.sh $X86_FLAG && \ /buildscripts/install-liquidprompt-binary.sh && \ - PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \ + PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python") && \ /buildscripts/install-python-packages.sh -python ${PYTHON} && \ /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \ rm -rf /buildscripts diff --git a/imagefiles/build-and-install-ninja.sh b/imagefiles/build-and-install-ninja.sh index 7830c76..a2789dc 100755 --- a/imagefiles/build-and-install-ninja.sh +++ b/imagefiles/build-and-install-ninja.sh @@ -10,7 +10,7 @@ set -e set -o pipefail -PYTHON=python3 +PYTHON=python while [ $# -gt 0 ]; do case "$1" in -python) diff --git a/imagefiles/install-python-packages.sh b/imagefiles/install-python-packages.sh index 40cfb70..088a4e7 100755 --- a/imagefiles/install-python-packages.sh +++ b/imagefiles/install-python-packages.sh @@ -3,7 +3,7 @@ set -e set -o pipefail -PYTHON=python3 +PYTHON=python while [ $# -gt 0 ]; do case "$1" in -python)