Revert "add exe to syft tool name in one place"

This reverts commit bd5d548. Signed-off-by: Will Murphy <[email protected]>
anchore · Nov 7, 2023 · 8b47c75 · 8b47c75
1 parent bd5d548
commit 8b47c75
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 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
@@ -22,8 +22,7 @@ import {
 import { downloadSyftFromZip } from "./SyftDownloader";
 import { stringify } from "./Util";
 
-export const SYFT_BINARY_NAME =
-  "syft" + (process.platform == "win32" ? ".exe" : "");
+export const SYFT_BINARY_NAME = "syft";
 export const SYFT_VERSION = core.getInput("syft-version") || VERSION;
 
 const PRIOR_ARTIFACT_ENV_VAR = "ANCHORE_SBOM_ACTION_PRIOR_ARTIFACT";
@@ -206,14 +205,18 @@ export async function downloadSyft(): Promise<string> {
 
   await execute("sh", [installPath, "-d", "-b", syftBinaryPath, version]);
 
-  return path.join(`${syftBinaryPath}`, `${name}`);
+  const installedPath = path.join(`${syftBinaryPath}`, `${name}`);
+  if (process.platform === "win32") {
+    return `${installedPath}.exe`;
+  }
+  return installedPath;
 }
 
 /**
  * Gets the Syft command to run via exec
  */
 export async function getSyftCommand(): Promise<string> {
-  const name = SYFT_BINARY_NAME;
+  const name = SYFT_BINARY_NAME + (process.platform == "win32" ? ".exe" : "");
   const version = SYFT_VERSION;
 
   const sourceSyft = await downloadSyftFromZip(version);