Merge pull request #923 from Vlatombe/JENKINS-63847

Author: Vlatombe

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java

@@ -464,7 +464,8 @@ public void onClose(int i, String s) {
                     if (pwd != null) {
                         // We need to get into the project workspace.
                         // The workspace is not known in advance, so we have to execute a cd command.
-                        in.println(String.format("cd \"%s\"", pwd));
+                        in.print(String.format("cd \"%s\"", pwd));
+                        in.print(newLine(!launcher.isUnix()));
                     }
 
                     EnvVars envVars = new EnvVars();
@@ -491,9 +492,9 @@ public void onClose(int i, String s) {
 
                     LOGGER.log(Level.FINEST, "Launching with env vars: {0}", envVars.toString());
 
-                    setupEnvironmentVariable(envVars, in, sh.equals("cmd"));
+                    setupEnvironmentVariable(envVars, in, !launcher.isUnix());
 
-                    doExec(in, printStream, masks, commands);
+                    doExec(in, !launcher.isUnix(), printStream, masks, commands);
 
                     LOGGER.log(Level.INFO, "Created process inside pod: [" + getPodName() + "], container: ["
                             + containerName + "]" + "[" + TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startMethod) + " ms]");
@@ -527,19 +528,24 @@ private void setupEnvironmentVariable(EnvVars vars, PrintStream out, boolean win
                 for (Map.Entry<String, String> entry : vars.entrySet()) {
                     //Check that key is bash compliant.
                     if (entry.getKey().matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
-                            out.println(
+                            out.print(
                                     String.format(
                                             windows ? "set %s=%s" : "export %s='%s'",
                                             entry.getKey(),
                                             windows ? entry.getValue() : entry.getValue().replace("'", "'\\''")
                                     )
                             );
+                            out.print(newLine(windows));
                         }
                     }
             }
         };
     }
 
+    private static String newLine(boolean windows) {
+        return windows ? "\r\n" : "\n";
+    }
+
     @Override
     public void close() throws IOException {
         if (closables == null) return;
@@ -618,7 +624,7 @@ private boolean isSeparator(int b) {
         }
     }
 
-    private static void doExec(PrintStream in, PrintStream out, boolean[] masks, String... statements) {
+    private static void doExec(PrintStream in, boolean windows, PrintStream out, boolean[] masks, String... statements) {
         long start = System.nanoTime();
         // For logging
         ByteArrayOutputStream loggingOutput = new ByteArrayOutputStream();
@@ -639,10 +645,11 @@ private static void doExec(PrintStream in, PrintStream out, boolean[] masks, Str
                    .append(statements[i])
                    .append("\" ");
             }
-            tee.println();
+            tee.print(newLine(windows));
             LOGGER.log(Level.FINEST, loggingOutput.toString(encoding) + "[" + TimeUnit.NANOSECONDS.toMicros(System.nanoTime() - start) + " μs." + "]");
             // We need to exit so that we know when the command has finished.
-            tee.println(EXIT);
+            tee.print(EXIT);
+            tee.print(newLine(windows));
             tee.flush();
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();