admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add double-quotes to allow spaces in path (#1097)

Browse Source
This commit is contained in:
Joel Van Eenwyk
2022-08-30 07:25:39 -07:00
committed by GitHub
parent 21611d2a50
commit b1bb477e38
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emsdk
View File

@@ -8,14 +8,14 @@
# First look for python bundled in Emsdk # First look for python bundled in Emsdk
if [ -z "$EMSDK_PYTHON" ]; then if [ -z "$EMSDK_PYTHON" ]; then
PYTHON3=$(dirname $0)/python/3.9.2-1_64bit/bin/python3 PYTHON3="$(dirname "$0")/python/3.9.2-1_64bit/bin/python3"
PYTHON3_CERT_FILE=$(dirname $0)/python/3.9.2-1_64bit/lib/python3.9/site-packages/certifi/cacert.pem PYTHON3_CERT_FILE="$(dirname "$0")/python/3.9.2-1_64bit/lib/python3.9/site-packages/certifi/cacert.pem"
if [ ! -f $PYTHON3 ]; then if [ ! -f "$PYTHON3" ]; then
PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3 PYTHON3="$(dirname "$0")/python/3.7.4-2_64bit/bin/python3"
PYTHON3_CERT_FILE=$(dirname $0)/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem PYTHON3_CERT_FILE="$(dirname "$0")/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem"
fi fi
if [ -f $PYTHON3 ]; then if [ -f "$PYTHON3" ]; then
EMSDK_PYTHON=$PYTHON3 EMSDK_PYTHON="$PYTHON3"
# When using our bundled python we never want the users # When using our bundled python we never want the users
# PYTHONHOME or PYTHONPATH # PYTHONHOME or PYTHONPATH
@@ -26,15 +26,14 @@ if [ -z "$EMSDK_PYTHON" ]; then
# This is needed for MacOS. Without this, the urlopen # This is needed for MacOS. Without this, the urlopen
# code will try to use /usr/local/etc/openssl/cert.pem # code will try to use /usr/local/etc/openssl/cert.pem
# which may or may not exist on the system. # which may or may not exist on the system.
export SSL_CERT_FILE=$PYTHON3_CERT_FILE export SSL_CERT_FILE="$PYTHON3_CERT_FILE"
fi fi
fi fi
# If bundled python is not found, look for `python3` in PATH. This is especially important on macOS (See: # If bundled python is not found, look for `python3` in PATH. This is especially important on macOS (See:
# https://github.com/emscripten-core/emsdk/pull/273) # https://github.com/emscripten-core/emsdk/pull/273)
if [ -z "$EMSDK_PYTHON" ]; then if [ -z "$EMSDK_PYTHON" ]; then
PYTHON3=$(which python3 2> /dev/null) if PYTHON3="$(which python3 2>/dev/null)"; then
if [ $? = 0 ]; then
EMSDK_PYTHON=$PYTHON3 EMSDK_PYTHON=$PYTHON3
fi fi
fi fi

2
emsdk_env.sh
View File

@@ -69,5 +69,5 @@ if [ ! -f "$DIR/emsdk.py" ]; then
fi fi
# Force emsdk to use bash syntax so that this works in windows + bash too # Force emsdk to use bash syntax so that this works in windows + bash too
eval `EMSDK_BASH=1 $DIR/emsdk construct_env` eval `EMSDK_BASH=1 "$DIR/emsdk" construct_env`
unset DIR unset DIR