Skip to content

Remove bash-ism from emsdk_env.sh #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 2 commits into from
Jul 14, 2020
Merged

Remove bash-ism from emsdk_env.sh #552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f18abf
When not running under bash, emsdk_env.sh only works from the current…
sbc100 Jul 14, 2020
de722b2
.
sbc100 Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions emsdk_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/sh
# This script is sourced by the user and uses
# their shell. Try not to use bashisms.

Expand All @@ -15,11 +14,14 @@
# ./emsdk_env.sh
#
# which won't have any effect.
DIR="$BASH_SOURCE"
if [ "$DIR" = "" ]; then
DIR="$0"
if [ -z "$BASH_SOURCE" ]; then
if [ ! -f "./emsdk.py" ]; then
echo "error: You must be in the same directory as emsdk_env.sh when sourcing it (or switch to the bash shell)" 1>&2
fi
DIR="."
else
DIR="$(dirname "$BASH_SOURCE")"
fi
DIR="$(dirname "$DIR")"

# Force emsdk to use bash syntax so that this works in windows + bash too
eval `EMSDK_BASH=1 $DIR/emsdk construct_env`
Expand Down