extract shared exe suffix logic

Signed-off-by: Will Murphy <[email protected]>
anchore · Nov 7, 2023 · 2ca0d8f · 2ca0d8f
1 parent 6abdba0
commit 2ca0d8f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/dist/attachReleaseAssets/index.js b/dist/attachReleaseAssets/index.js
diff --git a/dist/downloadSyft/index.js b/dist/downloadSyft/index.js
diff --git a/dist/runSyftAction/index.js b/dist/runSyftAction/index.js
diff --git a/src/github/SyftGithubAction.ts b/src/github/SyftGithubAction.ts
@@ -30,6 +30,8 @@ const PRIOR_ARTIFACT_ENV_VAR = "ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT";
 const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "sbom-action-"));
 const githubDependencySnapshotFile = `${tempDir}/github.sbom.json`;
 
+const exeSuffix = process.platform == "win32" ? ".exe" : "";
+
 /**
  * Tries to get a unique artifact name or otherwise as appropriate as possible
  */
@@ -205,18 +207,14 @@ export async function downloadSyft(): Promise<string> {
 
   await execute("sh", [installPath, "-d", "-b", syftBinaryPath, version]);
 
-  const installedPath = path.join(`${syftBinaryPath}`, `${name}`);
-  if (process.platform === "win32") {
-    return `${installedPath}.exe`;
-  }
-  return installedPath;
+  return path.join(syftBinaryPath, name) + exeSuffix;
 }
 
 /**
  * Gets the Syft command to run via exec
  */
 export async function getSyftCommand(): Promise<string> {
-  const name = SYFT_BINARY_NAME + (process.platform == "win32" ? ".exe" : "");
+  const name = SYFT_BINARY_NAME + exeSuffix;
   const version = SYFT_VERSION;
 
   const sourceSyft = await downloadSyftFromZip(version);