Fix module-path if javafxDir contains spaces (chunky-dev#785)

* Fix module-path if javafxDir contains spaces Adds double quotes around javafxDir fixing issues with directories like `C:\Program Files\AdoptOpenJDK\jdk-11.0.9.11-hotspot\lib`. * Add comment
jackjt8 · Jan 19, 2021 · 4419bd7 · 4419bd7
1 parent ad3806d
commit 4419bd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java b/launcher/src/se/llbit/chunky/launcher/ChunkyLauncher.java
@@ -58,7 +58,7 @@
  */
 public class ChunkyLauncher {
 
-  public static final String LAUNCHER_VERSION = "v1.12.0";
+  public static final String LAUNCHER_VERSION = "v1.12.1";
 
   /**
    * Print a launch error message to the console.

diff --git a/launcher/src/se/llbit/chunky/launcher/JavaFxLocator.java b/launcher/src/se/llbit/chunky/launcher/JavaFxLocator.java
@@ -61,7 +61,8 @@ private static void runWithJavafx(Path javafxDir, String[] args) {
     cmd.add("--javaOptions");
     StringBuilder javaOptions = new StringBuilder();
     javaOptions.append("--module-path ");
-    javaOptions.append(javafxDir.toAbsolutePath().toString());
+    // Escape the path twice to make the second launcher pass the options to Chunky retaining the double speechmarks (fixes paths with spaces)
+    javaOptions.append("\\\"" + javafxDir.toAbsolutePath().toString() + "\\\"");
     javaOptions.append(" --add-modules ");
     javaOptions.append("javafx.controls,javafx.fxml");
     cmd.add(javaOptions.toString());