fix: prevent adding /usr/bin if it is already on the PATH

aminya · Sep 1, 2023 · 307b917 · 307b917
1 parent 511e70e
commit 307b917
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 44 deletions.
diff --git a/dist/actions/setup-cpp.js b/dist/actions/setup-cpp.js
diff --git a/dist/actions/setup-cpp.js.map b/dist/actions/setup-cpp.js.map
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.js b/dist/modern/setup-cpp.js
diff --git a/dist/modern/setup-cpp.js.map b/dist/modern/setup-cpp.js.map
diff --git a/src/utils/env/addEnv.ts b/src/utils/env/addEnv.ts
@@ -61,12 +61,27 @@ function escapeString(valGiven: string, shouldEscapeSpace: boolean = false) {
   return escapeQuote(spaceEscaped, '"', "\\")
 }
 
+const ignoredPaths = [/\/usr\/bin\/?/, /\/usr\/local\/bin\/?/]
+
+/** Skip adding /usr/bin to PATH if it is already there */
+function isIgnoredPath(path: string) {
+  if (ignoredPaths.some((checkedPath) => checkedPath.test(path))) {
+    const paths = process.env.PATH?.split(delimiter) ?? []
+    return paths.includes(path)
+  }
+  return false
+}
+
 /**
  * Add a path to the PATH environment variable.
  *
  * This function is cross-platforms and works in all the local or CI systems.
  */
 export async function addPath(path: string) {
+  if (isIgnoredPath(path)) {
+    return
+  }
+
   process.env.PATH = `${path}${delimiter}${process.env.PATH}`
   try {
     if (GITHUB_ACTIONS) {