Skip to content

Avoid file creation/deletion races in emsdk_env.sh by using a tempora… #307

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
kripken merged 2 commits into from
Jul 26, 2019
Merged

Avoid file creation/deletion races in emsdk_env.sh by using a tempora… #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
507b56d
Avoid file creation/deletion races in emsdk_env.sh by using a tempora…
vargaz Jul 26, 2019
def06b0
Fix indentation.
vargaz Jul 26, 2019
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
10 changes: 7 additions & 3 deletions emsdk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,13 +2531,17 @@ def main():

return 0
elif cmd == 'construct_env':
silentremove(EMSDK_SET_ENV) # Clean up old temp file up front, in case of failure later before we get to write out the new one.
if len(sys.argv) == 2:
outfile = EMSDK_SET_ENV
silentremove(EMSDK_SET_ENV) # Clean up old temp file up front, in case of failure later before we get to write out the new one.
else:
outfile = sys.argv[2]
tools_to_activate = currently_active_tools()
tools_to_activate = process_tool_list(tools_to_activate, log_errors=True)
env_string = construct_env(tools_to_activate, len(sys.argv) >= 3 and 'perm' in sys.argv[2])
open(EMSDK_SET_ENV, 'w').write(env_string)
open(outfile, 'w').write(env_string)
if LINUX or OSX:
os.chmod(EMSDK_SET_ENV, 0o755)
os.chmod(outfile, 0o755)
return 0
elif cmd == 'update':
update_emsdk()
Expand Down
7 changes: 4 additions & 3 deletions emsdk_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# ./emsdk_env.sh
#
# which won't have any effect.

SRC="$BASH_SOURCE"
if [ "$SRC" = "" ]; then
SRC="$0"
Expand All @@ -23,7 +22,9 @@ CURDIR="$(pwd)"
cd "$(dirname "$SRC")"
unset SRC

./emsdk construct_env "$@"
. ./emsdk_set_env.sh
tmpfile=`mktemp` || exit 1
./emsdk construct_env "$@" $tmpfile
. $tmpfile
rm -f $tmpfile

cd "$CURDIR"