[FIXED JENKINS-25678] Double-double quoting to handle paths with both…

… spaces and special characters like @.
jenkinsci · Feb 20, 2016 · 38fc470 · 38fc470
1 parent 7b17a50
commit 38fc470
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/durabletask/WindowsBatchScript.java b/src/main/java/org/jenkinsci/plugins/durabletask/WindowsBatchScript.java
@@ -54,14 +54,14 @@ public String getScript() {
         }
         BatchController c = new BatchController(ws);
 
-        c.getBatchFile1(ws).write(String.format("cmd /c \"%s\" > \"%s\" 2>&1\r\necho %%ERRORLEVEL%% > \"%s\"\r\n",
+        c.getBatchFile1(ws).write(String.format("cmd /c \"\"%s\"\" > \"%s\" 2>&1\r\necho %%ERRORLEVEL%% > \"%s\"\r\n",
                 c.getBatchFile2(ws),
                 c.getLogFile(ws),
                 c.getResultFile(ws)
         ), "UTF-8");
         c.getBatchFile2(ws).write(script, "UTF-8");
 
-        Launcher.ProcStarter ps = launcher.launch().cmds("cmd", "/c", c.getBatchFile1(ws).getRemote()).envs(envVars).pwd(ws).quiet(true);
+        Launcher.ProcStarter ps = launcher.launch().cmds("cmd", "/c", "\"\"" + c.getBatchFile1(ws) + "\"\"").envs(envVars).pwd(ws).quiet(true);
         listener.getLogger().println("[" + ws.getRemote().replaceFirst("^.+\\\\", "") + "] Running batch script"); // details printed by cmd
         /* Too noisy, and consumes a thread:
         ps.stdout(listener);

diff --git a/src/test/java/org/jenkinsci/plugins/durabletask/WindowsBatchScriptTest.java b/src/test/java/org/jenkinsci/plugins/durabletask/WindowsBatchScriptTest.java
@@ -49,8 +49,17 @@ public class WindowsBatchScriptTest {
 
     @Issue("JENKINS-25678")
     @Test public void spaceInPath() throws Exception {
+        doSpaceInPath("space in path");
+    }
+
+    @Issue("JENKINS-25678")
+    @Test public void spaceInPath2() throws Exception {
+        doSpaceInPath("space in path@2");
+    }
+
+    private void doSpaceInPath(String name) throws Exception {
         StreamTaskListener listener = StreamTaskListener.fromStdout();
-        FilePath ws = j.jenkins.getRootPath().child("space in path");
+        FilePath ws = j.jenkins.getRootPath().child(name);
         Launcher launcher = j.jenkins.createLauncher(listener);
         Controller c = new WindowsBatchScript("echo hello world").launch(new EnvVars(), ws, launcher, listener);
         while (c.exitStatus(ws, launcher) == null) {