chore: move addPath function

src/chocolatey/chocolatey.ts

@@ -3,7 +3,7 @@ import execa from "execa"
 import { existsSync } from "fs"
 import { dirname } from "path"
 import which from "which"
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { InstallationInfo } from "../utils/setup/setupBin"
 
 let binDir: string | undefined

src/cppcheck/cppcheck.ts

@@ -1,4 +1,4 @@
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { setupAptPack } from "../utils/setup/setupAptPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"

src/doxygen/doxygen.ts

@@ -1,4 +1,4 @@
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { setupAptPack } from "../utils/setup/setupAptPack"
 import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"

src/gcc/gcc.ts

@@ -1,4 +1,4 @@
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { existsSync } from "fs"
 import { setupAptPack } from "../utils/setup/setupAptPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"

src/graphviz/graphviz.ts

@@ -1,4 +1,4 @@
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { setupAptPack } from "../utils/setup/setupAptPack"
 import { InstallationInfo } from "../utils/setup/setupBin"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"

src/opencppcoverage/opencppcoverage.ts

@@ -1,4 +1,4 @@
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/python/python.ts

@@ -1,5 +1,5 @@
 import * as core from "@actions/core"
-import { addPath } from "../utils/path/addPath"
+import { addPath } from "../utils/env/addEnv"
 import { setupAptPack } from "../utils/setup/setupAptPack"
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"

src/utils/env/addEnv.ts

@@ -1,10 +1,10 @@
-import { exportVariable } from "@actions/core"
-import * as core from "@actions/core"
+import { exportVariable, addPath as ghAddPath, info } from "@actions/core"
 import { isGitHubCI } from "./isci"
 import { untildify_user as untildify } from "../path/untildify"
 import { appendFileSync } from "fs"
 import { error } from "../io/io"
 import { execPowershell } from "../exec/powershell"
+import { delimiter } from "path"
 
 /** An add path function that works locally or inside GitHub Actions */
 export function addEnv(name: string, val: string | undefined) {
@@ -31,7 +31,7 @@ function addEnvSystem(name: string, valGiven: string | undefined) {
     case "win32": {
       // We do not use `execa.sync(`setx PATH "${path};%PATH%"`)` because of its character limit
       execPowershell(`[Environment]::SetEnvironmentVariable("${name}", "${val}", "User")`)
-      core.info(`${name}="${val} was set in the environment."`)
+      info(`${name}="${val} was set in the environment."`)
       return
     }
     case "linux":
@@ -39,7 +39,7 @@ function addEnvSystem(name: string, valGiven: string | undefined) {
       // find profile path
       const profile_path = untildify(".profile")
       appendFileSync(profile_path, `\nexport ${name}="${val}"\n`)
-      core.info(`${name}="${val} was added to "${profile_path}"`)
+      info(`${name}="${val} was added to "${profile_path}"`)
       return
     }
     default: {
@@ -48,3 +48,46 @@ function addEnvSystem(name: string, valGiven: string | undefined) {
   }
   process.env[name] = val
 }
+
+/** An add path function that works locally or inside GitHub Actions */
+export function addPath(path: string) {
+  process.env.PATH = `${path}${delimiter}${process.env.PATH}`
+  try {
+    if (isGitHubCI()) {
+      ghAddPath(path)
+    } else {
+      addPathSystem(path)
+    }
+  } catch (err) {
+    try {
+      error(err as Error)
+      return addPathSystem(path)
+    } catch (err2) {
+      error(err2 as Error)
+    }
+    error(`Failed to add ${path} to the percistent PATH. You should add it manually.`)
+  }
+}
+
+function addPathSystem(path: string) {
+  switch (process.platform) {
+    case "win32": {
+      // We do not use `execa.sync(`setx PATH "${path};%PATH%"`)` because of its character limit and also because %PATH% is different for user and system
+      execPowershell(
+        `$USER_PATH=([Environment]::GetEnvironmentVariable("PATH", "User")); [Environment]::SetEnvironmentVariable("PATH", "${path};$USER_PATH", "User")`
+      )
+      info(`${path} was added to the PATH.`)
+      return
+    }
+    case "linux":
+    case "darwin": {
+      const profile_path = untildify(".profile")
+      appendFileSync(profile_path, `\nexport PATH=${path}:$PATH\n`)
+      info(`${path} was added to "${profile_path}"`)
+      return
+    }
+    default: {
+      return
+    }
+  }
+}

src/utils/path/addPath.ts

@@ -1,51 +0,0 @@
-import { addPath as ghAddPath } from "@actions/core"
-import { delimiter } from "path"
-import * as core from "@actions/core"
-import { isGitHubCI } from "../env/isci"
-import { untildify_user as untildify } from "./untildify"
-import { appendFileSync } from "fs"
-import { error } from "../io/io"
-import { execPowershell } from "../exec/powershell"
-
-/** An add path function that works locally or inside GitHub Actions */
-export function addPath(path: string) {
-  process.env.PATH = `${path}${delimiter}${process.env.PATH}`
-  try {
-    if (isGitHubCI()) {
-      ghAddPath(path)
-    } else {
-      addPathSystem(path)
-    }
-  } catch (err) {
-    try {
-      error(err as Error)
-      return addPathSystem(path)
-    } catch (err2) {
-      error(err2 as Error)
-    }
-    error(`Failed to add ${path} to the percistent PATH. You should add it manually.`)
-  }
-}
-
-function addPathSystem(path: string) {
-  switch (process.platform) {
-    case "win32": {
-      // We do not use `execa.sync(`setx PATH "${path};%PATH%"`)` because of its character limit and also because %PATH% is different for user and system
-      execPowershell(
-        `$USER_PATH=([Environment]::GetEnvironmentVariable("PATH", "User")); [Environment]::SetEnvironmentVariable("PATH", "${path};$USER_PATH", "User")`
-      )
-      core.info(`${path} was added to the PATH.`)
-      return
-    }
-    case "linux":
-    case "darwin": {
-      const profile_path = untildify(".profile")
-      appendFileSync(profile_path, `\nexport PATH=${path}:$PATH\n`)
-      core.info(`${path} was added to "${profile_path}"`)
-      return
-    }
-    default: {
-      return
-    }
-  }
-}

src/utils/setup/setupBin.ts

@@ -1,6 +1,6 @@
 import { find, downloadTool, cacheDir } from "@actions/tool-cache"
 import { info } from "@actions/core"
-import { addPath } from "../path/addPath"
+import { addPath } from "../env/addEnv"
 import { join } from "path"
 import { existsSync } from "fs"
 import { tmpdir } from "os"

src/utils/setup/setupChocoPack.ts

@@ -1,5 +1,5 @@
 /* eslint-disable require-atomic-updates */
-import { addPath } from "../path/addPath"
+import { addPath } from "../env/addEnv"
 import which from "which"
 import { setupChocolatey } from "../../chocolatey/chocolatey"
 import { InstallationInfo } from "./setupBin"

src/utils/setup/setupPipPack.ts

@@ -3,7 +3,7 @@ import { getExecOutput } from "@actions/exec"
 import execa from "execa"
 import which from "which"
 import { info } from "@actions/core"
-import { addPath } from "../path/addPath"
+import { addPath } from "../env/addEnv"
 import { setupPython } from "../../python/python"
 import { isBinUptoDate } from "./version"
 import { join } from "path"