Updates as per review comments

Author: Nikhil Bhoski

src/main/java/com/mathworks/ci/MatlabBuild.java

@@ -22,29 +22,33 @@ public interface MatlabBuild {
      * This Method decorates the launcher with MATLAB command provided and returns the Process
      * object to launch MATLAB with appropriate startup options like -r or -batch
      * 
-     * @param matlabLauncher current build launcher
      * @param workspace Current build workspace
      * @param launcher Current build launcher
      * @param listener Current build listener
+     * @param envVars Environment variables of the current build
      * @param matlabCommand MATLAB command to execute on shell
      * @return matlabLauncher returns the process launcher to run MATLAB commands
      */
-    default ProcStarter getProcessToRunMatlabCommand(ProcStarter matlabLauncher, FilePath workspace,
-            Launcher launcher, TaskListener listener, String matlabCommand, String uniqueName)
+    default ProcStarter getProcessToRunMatlabCommand(FilePath workspace,
+            Launcher launcher, TaskListener listener, EnvVars envVars, String matlabCommand, String uniqueName)
             throws IOException, InterruptedException {
         // Get node specific tmp directory to copy matlab runner script
         String tmpDir = getNodeSpecificTmpFolderPath(workspace);
         FilePath targetWorkspace = new FilePath(launcher.getChannel(), tmpDir);
+        ProcStarter matlabLauncher;
         if (launcher.isUnix()) {
             final String runnerScriptName = uniqueName + "/run_matlab_command.sh";
+            matlabLauncher = launcher.launch().envs(envVars);
             matlabLauncher.cmds(tmpDir + "/" + runnerScriptName, matlabCommand).stdout(listener);
 
             // Copy runner .sh for linux platform in workspace.
             copyFileInWorkspace(MatlabBuilderConstants.SHELL_RUNNER_SCRIPT, runnerScriptName,
                     targetWorkspace);
         } else {
             final String runnerScriptName = uniqueName + "\\run_matlab_command.bat";
-            matlabLauncher.cmds("cmd.exe","/C",tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
+            launcher = launcher.decorateByPrefix("cmd.exe", "/C");
+            matlabLauncher = launcher.launch().envs(envVars);
+            matlabLauncher.cmds(tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
                     .stdout(listener);
             // Copy runner.bat for Windows platform in workspace.
             copyFileInWorkspace(MatlabBuilderConstants.BAT_RUNNER_SCRIPT, runnerScriptName,

src/main/java/com/mathworks/ci/RunMatlabCommandBuilder.java

@@ -6,11 +6,8 @@
  * 
  */
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import javax.annotation.Nonnull;
-import org.apache.commons.io.FilenameUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -120,17 +117,18 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
                 "command_" + getUniqueNameForRunnerFile().replaceAll("-", "_");
         final FilePath uniqeTmpFolderPath =
                 getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
-        
+
         // Create MATLAB script
-        createMatlabScriptByName(uniqeTmpFolderPath,uniqueCommandFile,workspace,listener);
+        createMatlabScriptByName(uniqeTmpFolderPath, uniqueCommandFile, workspace, listener);
+        ProcStarter matlabLauncher;
 
         try {
-            // Start the launcher from temp folder
-            ProcStarter matlabLauncher = launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
+            matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
+                    uniqueCommandFile, uniqueTmpFldrName);
+            launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
             listener.getLogger()
                     .println("#################### Starting command output ####################");
-            return getProcessToRunMatlabCommand(matlabLauncher, workspace, launcher, listener,
-                    uniqueCommandFile, uniqueTmpFldrName).join();
+            return matlabLauncher.pwd(uniqeTmpFolderPath).join();
 
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());

src/main/java/com/mathworks/ci/RunMatlabTestsBuilder.java

@@ -238,15 +238,15 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
         final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
         ProcStarter matlabLauncher;
         try {
-            matlabLauncher = launcher.launch().pwd(workspace).envs(envVars);
+            matlabLauncher = getProcessToRunMatlabCommand(workspace, launcher, listener, envVars,
+                    constructCommandForTest(getInputArguments()), uniqueTmpFldrName);
 
             // Copy MATLAB scratch file into the workspace.
             FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
             copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,
                     MatlabBuilderConstants.MATLAB_TESTS_RUNNER_TARGET_FILE, targetWorkspace);
 
-            return getProcessToRunMatlabCommand(matlabLauncher, workspace, launcher, listener,
-                    constructCommandForTest(getInputArguments()), uniqueTmpFldrName).join();
+            return matlabLauncher.pwd(workspace).join();
         } catch (Exception e) {
             listener.getLogger().println(e.getMessage());
             return 1;