use safeWhich

github · Apr 23, 2021 · ce467e7 · ce467e7
1 parent 8c91ba8
commit ce467e7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/lib/toolcache.js b/lib/toolcache.js
diff --git a/lib/toolcache.js.map b/lib/toolcache.js.map
diff --git a/src/toolcache.ts b/src/toolcache.ts
@@ -5,6 +5,7 @@ import * as path from "path";
 import * as toolrunner from "@actions/exec/lib/toolrunner";
 import * as io from "@actions/io";
 import * as actionsToolcache from "@actions/tool-cache";
+import * as safeWhich from "@chrisgavin/safe-which";
 import * as semver from "semver";
 
 import { Logger } from "./logging";
@@ -49,14 +50,18 @@ export async function extractTar(
     // Determine whether GNU tar
     logger.debug("Checking tar --version");
     let versionOutput = "";
-    await new toolrunner.ToolRunner("tar", ["--version"], {
-      ignoreReturnCode: true,
-      silent: true,
-      listeners: {
-        stdout: (data) => (versionOutput += data.toString()),
-        stderr: (data) => (versionOutput += data.toString()),
-      },
-    }).exec();
+    await new toolrunner.ToolRunner(
+      await safeWhich.safeWhich("tar"),
+      ["--version"],
+      {
+        ignoreReturnCode: true,
+        silent: true,
+        listeners: {
+          stdout: (data) => (versionOutput += data.toString()),
+          stderr: (data) => (versionOutput += data.toString()),
+        },
+      }
+    ).exec();
     logger.debug(versionOutput.trim());
     const isGnuTar = versionOutput.toUpperCase().includes("GNU TAR");
     // Initialize args