nick-fields/retry
0
0
Fork 0
mirror of https://github.com/nick-fields/retry.git synced 2026-02-10 15:15:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: ureciocais <urecio@caisgroup.com>
Co-authored-by: Nick Fields <46869826+nick-fields@users.noreply.github.com>
This commit is contained in:
Unai Recio
2023-09-26 15:56:58 +02:00
committed by GitHub
parent 1d41e5db1a
commit 1139f998ef
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dist/index.js vendored
View File

@@ -948,7 +948,8 @@ function getExecutable(inputs) {
return OS === 'win32' ? 'powershell' : 'bash'; return OS === 'win32' ? 'powershell' : 'bash';
} }
var executable; var executable;
switch (inputs.shell) { var shellName = inputs.shell.split(' ')[0];
switch (shellName) {
case 'bash': case 'bash':
case 'python': case 'python':
case 'pwsh': { case 'pwsh': {
@@ -957,7 +958,7 @@ function getExecutable(inputs) {
} }
case 'sh': { case 'sh': {
if (OS === 'win32') { 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; executable = inputs.shell;
break; break;
@@ -965,13 +966,13 @@ function getExecutable(inputs) {
case 'cmd': case 'cmd':
case 'powershell': { case 'powershell': {
if (OS !== 'win32') { 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; break;
} }
default: { 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; return executable;

12
src/index.ts
View File

@@ -20,7 +20,9 @@ function getExecutable(inputs: Inputs): string {
} }
let executable: string; let executable: string;
switch (inputs.shell) { const shellName = inputs.shell.split(' ')[0];
switch (shellName) {
case 'bash': case 'bash':
case 'python': case 'python':
case 'pwsh': { case 'pwsh': {
@@ -29,7 +31,7 @@ function getExecutable(inputs: Inputs): string {
} }
case 'sh': { case 'sh': {
if (OS === 'win32') { 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; executable = inputs.shell;
break; break;
@@ -37,14 +39,14 @@ function getExecutable(inputs: Inputs): string {
case 'cmd': case 'cmd':
case 'powershell': { case 'powershell': {
if (OS !== 'win32') { 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; break;
} }
default: { default: {
throw new Error( 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`
); );
} }
} }