include-extensions was consulted too early, leaving the matched fil…

…es out of the manifest

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [10.0.14-SNAPSHOT]
+
+- `include-extensions` was consulted too early, leaving the matched files out of the manifest
+
 ## [1.0.13] - 2016-09-12
 
 - Support for fully customizable update UI, see (https://github.com/edvin/fxlauncher-custom-ui) 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>no.tornado</groupId>
     <artifactId>fxlauncher</artifactId>
-    <version>1.0.13</version>
+    <version>1.0.14-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>FX Launcher</name>
     <description>Auto updating launcher for JavaFX Applications</description>

src/main/java/fxlauncher/CreateManifest.java

@@ -24,7 +24,10 @@ public static void main(String[] args) throws IOException {
         URI baseURI = URI.create(args[0]);
         String launchClass = args[1];
         Path appPath = Paths.get(args[2]);
-        FXManifest manifest = create(baseURI, launchClass, appPath);
+
+        String cacheDir = null;
+        Boolean acceptDowngrade = null;
+        String parameters = null;
 
         if (args.length > 3) {
             // Parse named parameters
@@ -36,11 +39,11 @@ public static void main(String[] args) throws IOException {
             if (named != null) {
                 // Configure cacheDir
                 if (named.containsKey("cache-dir"))
-                    manifest.cacheDir = named.get("cache-dir");
+                    cacheDir = named.get("cache-dir");
 
                 // Configure acceptDowngrade
                 if (named.containsKey("accept-downgrade"))
-                    manifest.acceptDowngrade = Boolean.valueOf(named.get("accept-downgrade"));
+                    acceptDowngrade = Boolean.valueOf(named.get("accept-downgrade"));
 
                 // Add additional files with these extensions to manifest
                 if (named.containsKey("include-extensions"))
@@ -63,9 +66,14 @@ public static void main(String[] args) throws IOException {
 
             // Add the raw parameter string to the manifest
             if (rest.length() > 0)
-                manifest.parameters = rest.toString();
+                parameters = rest.toString();
         }
 
+        FXManifest manifest = create(baseURI, launchClass, appPath);
+        if (cacheDir != null) manifest.cacheDir = cacheDir;
+        if (acceptDowngrade != null) manifest.acceptDowngrade = acceptDowngrade;
+        if (parameters != null) manifest.parameters = parameters;
+
         JAXB.marshal(manifest, appPath.resolve("app.xml").toFile());
     }