CreateManifest supports the --cache-dir parameter

edvin · May 7, 2016 · 66bb5e0 · 66bb5e0
1 parent 9234bc6
commit 66bb5e0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/src/main/java/fxlauncher/CreateManifest.java b/src/main/java/fxlauncher/CreateManifest.java
@@ -8,6 +8,7 @@
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -22,17 +23,25 @@ public static void main(String[] args) throws IOException {
         if (args.length > 3) {
 	        // Parse named parameters
 	        List<String> rawParams = new ArrayList<>();
-	        for (int i = 3; i < args.length; i++)
-		        rawParams.add(args[i]);
+	        rawParams.addAll(Arrays.asList(args).subList(3, args.length));
 	        ParametersImpl params = new ParametersImpl(rawParams);
 	        Map<String, String> named = params.getNamed();
 
 	        // Configure cacheDir
 	        if (named != null && named.containsKey("cache-dir"))
 		        manifest.cacheDir = named.get("cache-dir");
 
+	        // Append the rest as manifest parameters
+	        StringBuilder rest = new StringBuilder();
+	        for (String raw : params.getRaw()) {
+		        if (raw.startsWith("--cache-dir=")) continue;
+		        if (rest.length() > 0) rest.append(" ");
+		        rest.append(raw);
+	        }
+
 	        // Add the raw parameter string to the manifest
-	        manifest.parameters = args[3];
+	        if (rest.length() > 0)
+	            manifest.parameters = rest.toString();
         }
 
         JAXB.marshal(manifest, appPath.resolve("app.xml").toFile());

diff --git a/src/main/java/fxlauncher/FXManifest.java b/src/main/java/fxlauncher/FXManifest.java
@@ -59,23 +59,28 @@ public Path resolveCacheDir(Map<String, String> namedParams) {
 
 		Path path;
 
-		if (cacheDir.startsWith("USERLIB/")) {
+		if (cacheDir.contains("USERLIB")) {
+			String replacement;
 			switch (OS.current) {
 				case mac:
-					path = Paths.get(System.getProperty("user.home"))
+					replacement = Paths.get(System.getProperty("user.home"))
 						.resolve("Library")
 						.resolve("Application Support")
-						.resolve(cacheDir.substring(8));
+						.resolve(cacheDir.substring(8))
+						.toString();
 					break;
 				case win:
-					path = Paths.get(System.getProperty("user.home"))
+					replacement = Paths.get(System.getProperty("user.home"))
 						.resolve("AppData")
-						.resolve(cacheDir.substring(8));
+						.resolve(cacheDir.substring(8))
+						.toString();
 					break;
 				default:
-					path = Paths.get(System.getProperty("user.home"))
-						.resolve("." + cacheDir.substring(8));
+					replacement = Paths.get(System.getProperty("user.home"))
+						.resolve("." + cacheDir.substring(8))
+						.toString();
 			}
+			path = Paths.get(replacement);
 		} else {
 			path = Paths.get(cacheDir);
 		}
@@ -88,7 +93,7 @@ public Path resolveCacheDir(Map<String, String> namedParams) {
 			}
 		}
 
-		return Paths.get(cacheDir);
+		return path;
 	}
 
 	public boolean equals(Object o) {

diff --git a/src/main/java/fxlauncher/Launcher.java b/src/main/java/fxlauncher/Launcher.java
@@ -58,6 +58,7 @@ public void start(Stage primaryStage) throws Exception {
                 updateManifest();
                 createUpdateWrapper();
 	            Path cacheDir = manifest.resolveCacheDir(getParameters().getNamed());
+	            log.info(String.format("Using cache dir %s", cacheDir));
 	            syncFiles(cacheDir);
             } catch (Exception ex) {
                 log.log(Level.WARNING, String.format("Error during %s phase", phase), ex);

diff --git a/src/main/java/fxlauncher/LauncherParams.java b/src/main/java/fxlauncher/LauncherParams.java
@@ -36,7 +36,7 @@ public LauncherParams(Application.Parameters delegate, FXManifest manifest) {
                     if (arg.startsWith("--") && arg.contains("=")) {
                         String argname = arg.substring(0, arg.indexOf("="));
                         if (rawArgs.stream().filter(a -> a.startsWith(argname)).findAny().isPresent())
-                                continue;
+	                        continue;
                     }
 
                     rawArgs.add(arg);