feat(shell): checks only the shell name and allows any argument (#118)

Co-authored-by: ureciocais <[email protected]> Co-authored-by: Nick Fields <[email protected]>
nick-fields · Sep 26, 2023 · 1139f99 · 1139f99
1 parent 1d41e5d
commit 1139f99
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -948,7 +948,8 @@ function getExecutable(inputs) {
         return OS === 'win32' ? 'powershell' : 'bash';
     }
     var executable;
-    switch (inputs.shell) {
+    var shellName = inputs.shell.split(' ')[0];
+    switch (shellName) {
         case 'bash':
         case 'python':
         case 'pwsh': {
@@ -957,21 +958,21 @@ function getExecutable(inputs) {
         }
         case 'sh': {
             if (OS === 'win32') {
-                throw new Error("Shell ".concat(inputs.shell, " not allowed on OS ").concat(OS));
+                throw new Error("Shell ".concat(shellName, " not allowed on OS ").concat(OS));
             }
             executable = inputs.shell;
             break;
         }
         case 'cmd':
         case 'powershell': {
             if (OS !== 'win32') {
-                throw new Error("Shell ".concat(inputs.shell, " not allowed on OS ").concat(OS));
+                throw new Error("Shell ".concat(shellName, " not allowed on OS ").concat(OS));
             }
-            executable = inputs.shell + '.exe';
+            executable = shellName + '.exe' + inputs.shell.replace(shellName, '');
             break;
         }
         default: {
-            throw new Error("Shell ".concat(inputs.shell, " not supported.  See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells"));
+            throw new Error("Shell ".concat(shellName, " not supported.  See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells"));
         }
     }
     return executable;

diff --git a/src/index.ts b/src/index.ts
@@ -20,7 +20,9 @@ function getExecutable(inputs: Inputs): string {
   }
 
   let executable: string;
-  switch (inputs.shell) {
+  const shellName = inputs.shell.split(' ')[0];
+
+  switch (shellName) {
     case 'bash':
     case 'python':
     case 'pwsh': {
@@ -29,22 +31,22 @@ function getExecutable(inputs: Inputs): string {
     }
     case 'sh': {
       if (OS === 'win32') {
-        throw new Error(`Shell ${inputs.shell} not allowed on OS ${OS}`);
+        throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
       }
       executable = inputs.shell;
       break;
     }
     case 'cmd':
     case 'powershell': {
       if (OS !== 'win32') {
-        throw new Error(`Shell ${inputs.shell} not allowed on OS ${OS}`);
+        throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
       }
-      executable = inputs.shell + '.exe';
+      executable = shellName + '.exe' + inputs.shell.replace(shellName, '');
       break;
     }
     default: {
       throw new Error(
-        `Shell ${inputs.shell} not supported.  See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells`
+        `Shell ${shellName} not supported.  See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells`
       );
     }
   }