use https://bootstrap.pypa.io/pip/2.7/get-pip.py, instead of https://…

…bootstrap.pypa.io/get-pip.py
esteve · Apr 27, 2022 · 652d311 · 652d311
1 parent 08d4a10
commit 652d311
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/prepare_requirements_ros1.sh b/prepare_requirements_ros1.sh
@@ -22,6 +22,7 @@ mkdir -p ccache-build/
 mkdir -p ${PWD}/Python-${PYTHON2_VERSION}-host
 mkdir -p ${PWD}/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}
 
+ROS_PEPPER_CI=${ROS_PEPPER_CI:=}
 USE_TTY=""
 if [ -z "$ROS_PEPPER_CI" ]; then
   USE_TTY="-it"
@@ -60,8 +61,8 @@ docker run ${USE_TTY} --rm \
       ac_cv_file__dev_ptc=no && \
     export LD_LIBRARY_PATH=/home/nao/ctc/openssl/lib:/home/nao/ctc/zlib/lib:/home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/lib && \
     make -j4 install && \
-    wget -O - -q https://bootstrap.pypa.io/get-pip.py | /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/python && \
-    /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/pip install empy catkin-pkg setuptools vcstool numpy rospkg defusedxml netifaces"
+    wget -O - -q https://bootstrap.pypa.io/pip/2.7/get-pip.py | /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/python && \
+    /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/pip install empy catkin-pkg setuptools vcstool==0.2.15 numpy rospkg defusedxml netifaces"
 
 docker run ${USE_TTY} --rm \
   -u $(id -u) \
@@ -91,5 +92,5 @@ docker run ${USE_TTY} --rm \
     export LD_LIBRARY_PATH=/home/nao/ctc/openssl/lib:/home/nao/ctc/zlib/lib:/home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/lib && \
     export PATH=/home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin:\${PATH} && \
     make install && \
-    wget -O - -q https://bootstrap.pypa.io/get-pip.py | /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/python && \
-    /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/pip install empy catkin-pkg setuptools vcstool numpy rospkg defusedxml netifaces"
+    wget -O - -q https://bootstrap.pypa.io/pip/2.7/get-pip.py | /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/python && \
+    /home/nao/${INSTALL_ROOT}/Python-${PYTHON2_VERSION}/bin/pip install empy catkin-pkg setuptools vcstool==0.2.15 numpy rospkg defusedxml netifaces"