Merge pull request #78 from matlab-actions/no-sudo

Don't add the sudo prefix if sudo is not on the path

Author: sameagen-MW

package-lock.json

@@ -21,7 +21,7 @@
         "@actions/cache": "^3.2.2",
         "@actions/core": "^1.10.0",
         "@actions/exec": "^1.1.0",
-        "@actions/io": "^1.1.2",
+        "@actions/io": "^1.1.3",
         "@actions/tool-cache": "^1.7.1"
     },
     "devDependencies": {

package.json

@@ -1,6 +1,7 @@
-// Copyright 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import * as exec from "@actions/exec";
+import * as io from "@actions/io";
 import * as tc from "@actions/tool-cache";
 import path from "path";
 
@@ -13,7 +14,7 @@ import path from "path";
  */
 export async function downloadAndRunScript(platform: string, url: string, args?: string[]) {
     const scriptPath = await tc.downloadTool(url);
-    const cmd = generateExecCommand(platform, scriptPath);
+    const cmd = await generateExecCommand(platform, scriptPath);
 
     const exitCode = await exec.exec(cmd, args);
 
@@ -29,12 +30,15 @@ export async function downloadAndRunScript(platform: string, url: string, args?:
  * @param platform Operating system of the runner (e.g. "win32" or "linux").
  * @param scriptPath Path to the script (on runner's filesystem).
  */
-export function generateExecCommand(platform: string, scriptPath: string): string {
+export async function generateExecCommand(platform: string, scriptPath: string): Promise<string> {
     // Run the install script using bash
     let installCmd = `bash ${scriptPath}`;
 
     if (platform !== "win32") {
-        installCmd = `sudo -E ${installCmd}`;
+        const sudo = await io.which("sudo");
+        if (sudo) {
+            installCmd = `sudo -E ${installCmd}`;
+        }
     }
 
     return installCmd;
@@ -48,4 +52,4 @@ export function defaultInstallRoot(platform: string, programName: string): strin
         installRoot = path.join("/","opt", programName);
     }
     return installRoot;
-}
+}

src/script.ts

@@ -1,10 +1,12 @@
-// Copyright 2020-2022 The MathWorks, Inc.
+// Copyright 2020-2023 The MathWorks, Inc.
 
 import * as exec from "@actions/exec";
+import * as io from "@actions/io";
 import * as toolCache from "@actions/tool-cache";
 import * as script from "./script";
 
 jest.mock("@actions/exec");
+jest.mock("@actions/io");
 jest.mock("@actions/tool-cache");
 
 afterEach(() => {
@@ -56,6 +58,8 @@ describe("script downloader/runner", () => {
 });
 
 describe("install command generator", () => {
+    const whichMock = io.which as jest.Mock;
+
     const scriptPath = "hello.sh";
 
     beforeAll(() => {
@@ -64,13 +68,20 @@ describe("install command generator", () => {
 
     it("does not change the command on Windows", () => {
         const cmd = script.generateExecCommand("win32", scriptPath);
-        expect(cmd).toEqual(`bash ${scriptPath}`);
+        expect(cmd).resolves.toEqual(`bash ${scriptPath}`);
     });
 
     ["darwin", "linux"].forEach((platform) => {
         it(`calls the command with sudo on ${platform}`, () => {
+            whichMock.mockResolvedValue("path/to/sudo"); 
+            const cmd = script.generateExecCommand(platform, scriptPath);
+            expect(cmd).resolves.toEqual(`sudo -E bash ${scriptPath}`);
+        });
+
+        it(`calls the command without sudo on ${platform}`, () => {
+            whichMock.mockResolvedValue("");
             const cmd = script.generateExecCommand(platform, scriptPath);
-            expect(cmd).toEqual(`sudo -E bash ${scriptPath}`);
+            expect(cmd).resolves.toEqual(`bash ${scriptPath}`);
         });
     });
 });
@@ -87,4 +98,4 @@ describe("default install root", () => {
     testCase("win32", 'Program Files');
     testCase("darwin", "opt");
     testCase("linux", "opt");
-})
+})