Merge branch 'issue-403' into devel

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDmg.java

@@ -87,7 +87,7 @@ protected File doApply(MacPackager packager) throws Exception {
 		// creates image
 		Logger.info("Creating image: " + tempDmgFile.getAbsolutePath());
 		String osArchitecture = System.getProperty("os.arch");
-		boolean isAarch64 = osArchitecture.toLowerCase().equals("aarch64");
+		boolean isAarch64 = osArchitecture.equalsIgnoreCase("aarch64");
 		String fileSystem = isAarch64 ? "APFS" : "HFS+";
 		Logger.warn(osArchitecture + " architecture detected. Using " + fileSystem + " filesystem");
 		execute("hdiutil", "create", "-srcfolder", appFolder, "-volname", volumeName, "-ov", "-fs", fileSystem, "-format", "UDRW", tempDmgFile);
@@ -100,10 +100,9 @@ protected File doApply(MacPackager packager) throws Exception {
 		// mounts image
 		Logger.info("Mounting image: " + tempDmgFile.getAbsolutePath());
 		String result = execute("hdiutil", "attach", "-readwrite", "-noverify", "-noautoopen", tempDmgFile);
-		Optional<String> optDeviceName = Arrays.asList(result.split("\n"))
-								.stream()
+		Optional<String> optDeviceName = Arrays.stream(result.split("\n"))
 								.filter(s -> s.contains(mountFolder.getAbsolutePath()))
-								.map(s -> StringUtils.normalizeSpace(s))
+								.map(StringUtils::normalizeSpace)
 								.map(s -> s.split(" ")[0])
 								.findFirst();
 		optDeviceName.ifPresent(deviceName -> Logger.info("- Device name: " + deviceName));

src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java

@@ -25,7 +25,7 @@ public abstract class Packager extends PackagerSettings {
 
 	// artifact generators
 	protected List<ArtifactGenerator<?>> installerGenerators = new ArrayList<>();
-	private BundleJre generateJre = new BundleJre();
+	private final BundleJre generateJre = new BundleJre();
 
 	// internal generic properties (setted in "createAppStructure/createApp")
 	protected File appFolder;
@@ -395,13 +395,15 @@ public File createApp() throws Exception {
 		Logger.infoUnindent("Dependencies copied to " + libsFolder + "!");
 
 		// creates a runnable jar file
-		if (runnableJar != null && runnableJar.exists()) {
-			Logger.info("Using runnable JAR: " + runnableJar);
-			jarFile = runnableJar;
-		} else {
+		if (runnableJar == null) {
 			Logger.infoIndent("Creating runnable JAR...");
 			jarFile = Context.getContext().createRunnableJar(this);
 			Logger.infoUnindent("Runnable jar created in " + jarFile + "!");
+		} else if (runnableJar.exists()) {
+			Logger.info("Using runnable JAR: " + runnableJar);
+			jarFile = runnableJar;
+		} else {
+			throw new Exception("Runnable JAR doesn't exist: " + runnableJar);
 		}
 
 		// embeds a JRE if is required