From 405bce6a2f3503dbb55f94908978eb8b058a5631 Mon Sep 17 00:00:00 2001
From: Kenneth Tran <kennethtran93@users.noreply.github.com>
Date: Thu, 22 Oct 2020 22:09:25 -0700
Subject: [PATCH] Move bash_args up.

---
 dist/index.js | 22 ++++++++++------------
 index.js      | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 5c9c419..1a89f1d 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2535,9 +2535,7 @@ try {
   fail_ci = truthy.includes(core.getInput("fail_ci_if_error").toLowerCase());
 
   const bash_args = core.getInput("bash_args");
-  core.debug(`bash_args: ${bash_args}`);
   const bash_args_clean = bash_args.split(/[\n]+/).map(s => s.trim()).filter(i => i !== '');
-  core.debug(`bash_args_clean (${bash_args_clean.length}: ${bash_args_clean}`);
 
   request({
     json: false,
@@ -2614,6 +2612,16 @@ try {
           );
         }
 
+        if (bash_args_clean.length) {
+          for(const x of bash_args_clean) {
+            const arg = x.slice(0,2);
+            const val = x.slice(2).trim();
+            execArgs.push(
+              `${arg}`, `${val}`
+            );
+          }
+        }
+
         execArgs.push(
           "-n", `${name}`,
           "-F", `${flags}`
@@ -2643,16 +2651,6 @@ try {
           );
         }
 
-        if (bash_args_clean.length) {
-          for(const x of bash_args_clean) {
-            const arg = x.slice(0,2);
-            const val = x.slice(2).trim();
-            execArgs.push(
-              `${arg}`, `${val}`
-            );
-          }
-        }
-
         exec.exec("bash", execArgs, options)
           .catch(err => {
             if (fail_ci) {
diff --git a/index.js b/index.js
index 6507a94..6cfc217 100644
--- a/index.js
+++ b/index.js
@@ -96,6 +96,16 @@ try {
           );
         }
 
+        if (bash_args_clean.length) {
+          for(const x of bash_args_clean) {
+            const arg = x.slice(0,2);
+            const val = x.slice(2).trim();
+            execArgs.push(
+              `${arg}`, `${val}`
+            );
+          }
+        }
+
         execArgs.push(
           "-n", `${name}`,
           "-F", `${flags}`
@@ -125,16 +135,6 @@ try {
           );
         }
 
-        if (bash_args_clean.length) {
-          for(const x of bash_args_clean) {
-            const arg = x.slice(0,2);
-            const val = x.slice(2).trim();
-            execArgs.push(
-              `${arg}`, `${val}`
-            );
-          }
-        }
-
         exec.exec("bash", execArgs, options)
           .catch(err => {
             if (fail_ci) {