Skip to content
This repository was archived by the owner on Feb 4, 2022. It is now read-only.

Commit 213c7ae

Browse files
committed
Fix various windows related things
1 parent 1528863 commit 213c7ae

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

src/main/java/org/scijava/jupyter/commands/InstallScijavaKernel.java

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.nio.file.Paths;
2424
import java.util.Map;
2525
import org.scijava.Context;
26-
import org.scijava.ItemIO;
2726
import org.scijava.command.Command;
2827
import org.scijava.jupyter.service.JupyterService;
2928
import org.scijava.jupyter.utils.JupyterUtil;
@@ -33,7 +32,6 @@
3332
import org.scijava.plugin.Menu;
3433
import org.scijava.plugin.Parameter;
3534
import org.scijava.plugin.Plugin;
36-
import org.scijava.script.ScriptLanguage;
3735
import org.scijava.script.ScriptService;
3836

3937
@Plugin(type = Command.class, menu = {

src/main/java/org/scijava/jupyter/utils/JupyterUtil.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,12 @@ public static String createKernelJSON(String classpath, String logLevel, String
4646

4747
String finalClasspath = "";
4848
finalClasspath += SystemUtil.getImageJClassPaths();
49+
50+
String classPathSeparator = SystemUtil.getClassPathSeparator();
51+
4952
if (classpath != null) {
5053
if (finalClasspath.length() > 0) {
51-
finalClasspath += ":" + classpath;
54+
finalClasspath += classPathSeparator + classpath;
5255
} else {
5356
finalClasspath += classpath;
5457
}

src/main/java/org/scijava/jupyter/utils/SystemUtil.java

+16-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import java.io.File;
1919
import java.io.IOException;
20+
import java.nio.file.FileSystems;
2021
import java.nio.file.FileVisitOption;
2122
import java.nio.file.Files;
2223
import java.nio.file.Path;
@@ -44,9 +45,11 @@ public static String getImageJClassPaths() {
4445
String classPaths = "";
4546

4647
if (System.getProperty("imagej.dir") != null) {
47-
classPaths += Paths.get(System.getProperty("imagej.dir"), "jars", "*") + ":";
48-
classPaths += Paths.get(System.getProperty("imagej.dir"), "jars", "bio-formats", "*") + ":";
49-
classPaths += Paths.get(System.getProperty("imagej.dir"), "plugins", "*") + ":";
48+
49+
String classPathSeparator = SystemUtil.getClassPathSeparator();
50+
classPaths += Paths.get(System.getProperty("imagej.dir"), "jars") + FileSystems.getDefault().getSeparator() + "*" + classPathSeparator;
51+
classPaths += Paths.get(System.getProperty("imagej.dir"), "jars", "bio-formats") + FileSystems.getDefault().getSeparator() + "*" + classPathSeparator;
52+
classPaths += Paths.get(System.getProperty("imagej.dir"), "plugins") + FileSystems.getDefault().getSeparator() + "*" + classPathSeparator;
5053
}
5154

5255
return classPaths;
@@ -65,4 +68,14 @@ public static void deleteFolderRecursively(Path rootPath, LogService log) {
6568
}
6669
}
6770

71+
public static String getClassPathSeparator() {
72+
String classPathSeparator;
73+
if (System.getProperty("os.name").toLowerCase().contains("windows")) {
74+
classPathSeparator = ";";
75+
} else {
76+
classPathSeparator = ":";
77+
}
78+
return classPathSeparator;
79+
}
80+
6881
}

0 commit comments

Comments
 (0)