Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix activated_path_skip on repeated running of emsdk_env.sh
Browse files Browse the repository at this point in the history
The first time around `node` was being correctly added to the PATH, but
the second time around this code was observing the emsdk copy of node
in the PATH and assuming it could be skipped.

Fixes: #1240
sbc100 committed Jun 27, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 098a3ff commit 589fbbb
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -80,6 +80,7 @@ jobs:
- run:
name: Install debian packages
command: apt-get update -q && apt-get install -q -y cmake build-essential openjdk-8-jre-headless ksh zsh
- run: test/test_node_path.sh
- run: test/test.sh
- run: test/test_source_env.sh
- run:
13 changes: 11 additions & 2 deletions emsdk.py
Original file line number Diff line number Diff line change
@@ -1438,9 +1438,18 @@ def get_required_path(active_tools):
path_add = [to_native_path(EMSDK_PATH)]
for tool in active_tools:
if hasattr(tool, 'activated_path'):
if hasattr(tool, 'activated_path_skip') and which(tool.activated_path_skip):
continue
path = to_native_path(tool.expand_vars(tool.activated_path))
# If the tool has an activated_path_skip attribute then we don't add
# the tools path to the users path if a program by that name is found
# in the existing PATH. This allows us to, for example, add our version
# node to the users PATH if, and only if, they don't already have a
# another version of node in thier PATH.
if hasattr(tool, 'activated_path_skip'):
current_path = which(tool.activated_path_skip)
# We found an executable by this name in the current PATH, but we
# ignore our own version for this purpose.
if current_path and os.path.dirname(current_path) != path:
continue
path_add.append(path)
return path_add

0 comments on commit 589fbbb

Please sign in to comment.