Skip to content

Commit c04b1bb

Browse files
authored
Only add node/bin to user's PATH if one is not already found (#1189)
If the user already has a version of node in their PATH don't clobber it. This doesn't effect emscripten since the version of node we use there is controlled via the config file, not via PATH. Part of fix for #705.
1 parent 17f6a2e commit c04b1bb

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

emsdk.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,8 @@ def get_required_path(active_tools):
14331433
path_add = [to_native_path(EMSDK_PATH)]
14341434
for tool in active_tools:
14351435
if hasattr(tool, 'activated_path'):
1436+
if hasattr(tool, 'activated_path_skip') and which(tool.activated_path_skip):
1437+
continue
14361438
path = to_native_path(tool.expand_vars(tool.activated_path))
14371439
path_add.append(path)
14381440
return path_add

emsdk_manifest.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
"arch": "x86",
205205
"windows_url": "node-v14.15.5-win-x86.zip",
206206
"activated_path": "%installation_dir%/bin",
207+
"activated_path_skip": "node",
207208
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
208209
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
209210
},
@@ -214,6 +215,7 @@
214215
"bitness": 32,
215216
"linux_url": "node-v14.15.5-linux-armv7l.tar.xz",
216217
"activated_path": "%installation_dir%/bin",
218+
"activated_path_skip": "node",
217219
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
218220
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
219221
},
@@ -226,6 +228,7 @@
226228
"windows_url": "node-v14.15.5-win-x64.zip",
227229
"linux_url": "node-v14.15.5-linux-x64.tar.xz",
228230
"activated_path": "%installation_dir%/bin",
231+
"activated_path_skip": "node",
229232
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
230233
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
231234
},
@@ -237,6 +240,7 @@
237240
"macos_url": "node-v14.15.5-darwin-x64.tar.gz",
238241
"linux_url": "node-v14.15.5-linux-arm64.tar.xz",
239242
"activated_path": "%installation_dir%/bin",
243+
"activated_path_skip": "node",
240244
"activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
241245
"activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
242246
},

0 commit comments

Comments
 (0)