Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-02-02 07:46:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

STYLE: For consistency, rename install-ninja.sh to build-and-install-ninja.sh

Browse Source
This commit is contained in:
Jean-Christophe Fillion-Robin 2018-06-04 22:58:54 -04:00
parent 71759485f9
commit 007899c2a5
No known key found for this signature in database
GPG Key ID: BAF1E1AEB9097A41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.docker
View File

@ -39,11 +39,11 @@ COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
# /opt/rh/devtoolset-2/root/usr/bin/sudo expects sudo at this location # /opt/rh/devtoolset-2/root/usr/bin/sudo expects sudo at this location
COPY imagefiles/sudo.sh /usr/bin/sudo COPY imagefiles/sudo.sh /usr/bin/sudo
COPY imagefiles/install-ninja.sh /dockcross/ COPY imagefiles/build-and-install-ninja.sh /dockcross/
RUN \ RUN \
/dockcross/install-ninja.sh \ /dockcross/build-and-install-ninja.sh \
-python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
rm /dockcross/install-ninja.sh rm /dockcross/build-and-install-ninja.sh
RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \ RUN if [ -e /opt/python/cp35-cp35m/bin/python ]; then \
: nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \ : nothing to do here since it is updated by manylinux-common/install-python-packages.sh ; \

2
imagefiles/install-ninja.sh → imagefiles/build-and-install-ninja.sh
View File

@ -5,7 +5,7 @@
# #
# Usage: # Usage:
# #
# install-ninja.sh [-python /path/to/bin/python] # build-and-install-ninja.sh [-python /path/to/bin/python]
set -e set -e
set -o pipefail set -o pipefail