fix issue zyxist#41

use the host platform's path-separator character to delimit the files passed to the --patch-module option
siordache-forks · Oct 23, 2018 · 6660819 · 6660819
1 parent 028e726
commit 6660819
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/com/zyxist/chainsaw/algorithms/ModulePatcher.java b/src/main/java/com/zyxist/chainsaw/algorithms/ModulePatcher.java
@@ -23,6 +23,7 @@
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
+import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -74,7 +75,7 @@ private void toList(Map<String, PatchItem> patchCommands, String patchedModule,
 	}
 
 	private String toGenericName(ResolvedArtifact artifact) {
-		return artifact.getModuleVersion().getId().getGroup()+":"+artifact.getModuleVersion().getId().getName();
+		return artifact.getModuleVersion().getId().getGroup() + File.pathSeparator + artifact.getModuleVersion().getId().getName();
 	}
 
 

diff --git a/src/main/java/com/zyxist/chainsaw/jigsaw/cli/PatchItem.java b/src/main/java/com/zyxist/chainsaw/jigsaw/cli/PatchItem.java
@@ -17,6 +17,7 @@
 
 import com.zyxist.chainsaw.jigsaw.JigsawFlags;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -38,7 +39,7 @@ public PatchItem with(String jarFile) {
 	public void toArgs(List<String> args) {
 		if (!patchingJars.isEmpty()) {
 			args.add(JigsawFlags.PATCH_MODULE);
-			args.add(patchedModule+"="+patchingJars.stream().collect(Collectors.joining(":")));
+			args.add(patchedModule+"="+patchingJars.stream().collect(Collectors.joining(File.pathSeparator)));
 		}
 	}
 }
diff --git a/src/test/groovy/com/zyxist/chainsaw/jigsaw/cli/PatchItemSpec.groovy b/src/test/groovy/com/zyxist/chainsaw/jigsaw/cli/PatchItemSpec.groovy
@@ -43,7 +43,7 @@ class PatchItemSpec extends Specification {
 		then:
 		args.size() == 2
 		args.get(0) == '--patch-module'
-		args.get(1) == 'com.example.foo=/path/to/some.jar:/path/to/another.jar'
+		args.get(1) == "com.example.foo=/path/to/some.jar${File.pathSeparator}/path/to/another.jar"
 	}
 
 }