From 88a9bddc889f88ff2dbf389c34b47568cbcac0e3 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 31 Mar 2021 09:42:33 +0200 Subject: [PATCH 1/2] Fix bootstrap script for Dom --- bootstrap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 0d5a34e7d0..50f615f116 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -70,15 +70,16 @@ fi # Check if ensurepip is installed $python -m ensurepip --version &> /dev/null +export PATH=$(pwd)/external/usr/bin:$PATH + # Install pip for Python 3 if [ $? -eq 0 ]; then - CMD $python -m ensurepip --root external/ --default-pip + CMD $python -m ensurepip --root $(pwd)/external/ --default-pip fi # ensurepip installs pip in `external/usr/` whereas the --target option installs # everything under `external/`. That's why we include both in the PYTHONPATH -export PATH=$(pwd)/external/usr/bin:$PATH export PYTHONPATH=$(pwd)/external:$(pwd)/external/usr/lib/python$pyver/site-packages:$PYTHONPATH CMD $python -m pip install --no-cache-dir -q --upgrade pip --target=external/ From 048e2f81f6d70734077ded1f8c6a762d646bf9b2 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Wed, 31 Mar 2021 09:53:15 +0200 Subject: [PATCH 2/2] Address PR comments --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 50f615f116..9b39496f7d 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -77,7 +77,7 @@ if [ $? -eq 0 ]; then CMD $python -m ensurepip --root $(pwd)/external/ --default-pip fi -# ensurepip installs pip in `external/usr/` whereas the --target option installs +# ensurepip installs pip in `external/usr/` whereas the `--root` option installs # everything under `external/`. That's why we include both in the PYTHONPATH export PYTHONPATH=$(pwd)/external:$(pwd)/external/usr/lib/python$pyver/site-packages:$PYTHONPATH