Updated as per review comments.

Author: Nikhil Bhoski

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

@@ -44,7 +44,7 @@ default ProcStarter getProcessToRunMatlabCommand(ProcStarter matlabLauncher, Fil
                     targetWorkspace);
         } else {
             final String runnerScriptName = uniqueName + "\\run_matlab_command.bat";
-            matlabLauncher.cmds(tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
+            matlabLauncher.cmds("cmd.exe","/C",tmpDir + "\\" + runnerScriptName, "\"" + matlabCommand + "\"")
                     .stdout(listener);
             // Copy runner.bat for Windows platform in workspace.
             copyFileInWorkspace(MatlabBuilderConstants.BAT_RUNNER_SCRIPT, runnerScriptName,
@@ -87,12 +87,4 @@ default String getNodeSpecificTmpFolderPath(FilePath workspace) throws IOExcepti
     default String getUniqueNameForRunnerFile() {
         return UUID.randomUUID().toString();
     }
-    
-    default Launcher getDecoratedLauncherForWindows(Launcher launcher) {
-      //decorate the launcher if its on windows 
-        if(!launcher.isUnix()) {
-            launcher = launcher.decorateByPrefix("cmd.exe", "/C");
-        }
-        return launcher;
-    }
 }

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

@@ -118,23 +118,13 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
         final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
         final String uniqueCommandFile =
                 "command_" + getUniqueNameForRunnerFile().replaceAll("-", "_");
-
-        // Get unique temporary folder filepath
         final FilePath uniqeTmpFolderPath =
                 getFilePathForUniqueFolder(launcher, uniqueTmpFldrName, workspace);
-        // Create a new command runner script in the temp folder.
-        final FilePath matlabCommandFile =
-                new FilePath(uniqeTmpFolderPath, uniqueCommandFile + ".m");
-        final String matlabCommandFileContent =
-                "cd '" + workspace.getRemote().replaceAll("'", "''") + "';\n" + getCommand();
-
-        // Display the commands on console output for users reference
-        listener.getLogger()
-                .println("Generating MATLAB script with content:\n" + getCommand() + "\n");
+        
+        // Create MATLAB script
+        createMatlabScriptByName(uniqeTmpFolderPath,uniqueCommandFile,workspace,listener);
 
-        matlabCommandFile.write(matlabCommandFileContent, "UTF-8");
         try {
-            launcher = getDecoratedLauncherForWindows(launcher);
             // Start the launcher from temp folder
             ProcStarter matlabLauncher = launcher.launch().pwd(uniqeTmpFolderPath).envs(envVars);
             listener.getLogger()
@@ -152,4 +142,19 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
             }
         }
     }
+    
+    private void createMatlabScriptByName(FilePath uniqeTmpFolderPath, String uniqueScriptName, FilePath workspace, TaskListener listener) throws IOException, InterruptedException {
+     
+        // Create a new command runner script in the temp folder.
+        final FilePath matlabCommandFile =
+                new FilePath(uniqeTmpFolderPath, uniqueScriptName + ".m");
+        final String matlabCommandFileContent =
+                "cd '" + workspace.getRemote().replaceAll("'", "''") + "';\n" + getCommand();
+
+        // Display the commands on console output for users reference
+        listener.getLogger()
+                .println("Generating MATLAB script with content:\n" + getCommand() + "\n");
+
+        matlabCommandFile.write(matlabCommandFileContent, "UTF-8");
+    }
 }

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

@@ -238,11 +238,8 @@ private synchronized int execMatlabCommand(FilePath workspace, Launcher launcher
         final String uniqueTmpFldrName = getUniqueNameForRunnerFile();
         ProcStarter matlabLauncher;
         try {
-            // Get decorated launcher for Windows
-            launcher = getDecoratedLauncherForWindows(launcher);
             matlabLauncher = launcher.launch().pwd(workspace).envs(envVars);
-
-
+            
             // Copy MATLAB scratch file into the workspace.
             FilePath targetWorkspace = new FilePath(launcher.getChannel(), workspace.getRemote());
             copyFileInWorkspace(MatlabBuilderConstants.MATLAB_TESTS_RUNNER_RESOURCE,