Merge pull request #13 from jacobgardner/master

Use list instead of string for ProcessBuilder For External Deletion Tools
jenkinsci · Oct 8, 2013 · ffb4364 · ffb4364
2 parents 16ae770 + f6b776f
commit ffb4364
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/ws_cleanup/Cleanup.java b/src/main/java/hudson/plugins/ws_cleanup/Cleanup.java
@@ -51,7 +51,16 @@ public Object invoke(File f, VirtualChannel channel) throws IOException, Interru
         if (delete_command != null && patterns == null) {            
             temp_command = delete_command.replaceAll("%s", "\"" + StringEscapeUtils.escapeJava(f.getPath()) + "\"");
             this.listener.getLogger().println("Using command: " + temp_command);
-            Process deletion_proc = new ProcessBuilder(temp_command).start();
+            List<String> list = new ArrayList<String>();
+
+            java.util.regex.Pattern p = java.util.regex.Pattern.compile("\"[^\"]+\"|\\S+");
+            java.util.regex.Matcher m = p.matcher(temp_command);
+
+            while(m.find()) {
+                list.add(m.group());
+            }
+
+            Process deletion_proc = new ProcessBuilder(list).start();
             deletion_proc.waitFor();
 
             return null;