From 22ede2db8ea8fa65392956ba16da66c1363e5bc1 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Mon, 10 Apr 2023 13:54:35 -0700
Subject: [PATCH] Add `activated_path_skip` to node v14.18.2 packages (#1209)

This should have been part of #1189.  See #1183.
---
 emsdk_manifest.json      | 4 ++++
 test/test_activation.ps1 | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emsdk_manifest.json b/emsdk_manifest.json
index b14385b..b69b1e7 100644
--- a/emsdk_manifest.json
+++ b/emsdk_manifest.json
@@ -159,6 +159,7 @@
     "arch": "x86",
     "windows_url": "node-v14.18.2-win-x86.zip",
     "activated_path": "%installation_dir%/bin",
+    "activated_path_skip": "node",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
@@ -169,6 +170,7 @@
     "bitness": 32,
     "linux_url": "node-v14.18.2-linux-armv7l.tar.xz",
     "activated_path": "%installation_dir%/bin",
+    "activated_path_skip": "node",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
@@ -181,6 +183,7 @@
     "windows_url": "node-v14.18.2-win-x64.zip",
     "linux_url": "node-v14.18.2-linux-x64.tar.xz",
     "activated_path": "%installation_dir%/bin",
+    "activated_path_skip": "node",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
@@ -192,6 +195,7 @@
     "macos_url": "node-v14.18.2-darwin-x64.tar.gz",
     "linux_url": "node-v14.18.2-linux-arm64.tar.xz",
     "activated_path": "%installation_dir%/bin",
+    "activated_path_skip": "node",
     "activated_cfg": "NODE_JS='%installation_dir%/bin/node%.exe%'",
     "activated_env": "EMSDK_NODE=%installation_dir%/bin/node%.exe%"
   },
diff --git a/test/test_activation.ps1 b/test/test_activation.ps1
index 6d38ffc..6aeb5e5 100644
--- a/test/test_activation.ps1
+++ b/test/test_activation.ps1
@@ -53,10 +53,6 @@ try {
     if (!$EMSDK_Path) {
         throw "No path is added!"
     }
-    $EMSDK_NODE_Path = $path_split | Where-Object { $_ -like "$repo_root\node*" }
-    if (!$EMSDK_NODE_Path) {
-        throw "$repo_root\\node is not added to path."
-    }
 
     $EMSDK_UPSTREAM_Path = $path_split | Where-Object { $_ -like "$repo_root\upstream\emscripten*" }
     if (!$EMSDK_UPSTREAM_Path) {