U fixed issue when checking if an existing jre is valid before embedding it

Author: fvarrui

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

@@ -53,28 +53,39 @@ protected File doApply(Packager packager) throws Exception {
 
 			Logger.info("Embedding JRE from " + specificJreFolder);
 
-			// fixes the path to the JRE on MacOS if "release" file not found
-			if (platform.equals(Platform.mac) && !FileUtils.folderContainsFile(specificJreFolder, "release")) {
-				specificJreFolder = new File(specificJreFolder, "Contents/Home");
-				Logger.warn("Specified jrePath fixed: " + specificJreFolder);				
+			if (!specificJreFolder.isDirectory()) {
+				throw new Exception("'" + specificJreFolder + "' is not a directory!");
 			}
-			
-			// checks if valid jre specified
+
+			// checks if the specified jre is valid (it looks for 'release' file into it, and if so, checks if it matches the right platform 
 			if (!JDKUtils.isValidJRE(platform, specificJreFolder)) {
-				throw new Exception("Invalid JRE specified for '" + platform + "' platform: " + specificJreFolder);
+
+				Logger.warn("An invalid JRE may have been specified for '" + platform + "' platform: " + specificJreFolder + " ('release' file not found)");
+
+				// try to fix the path to the JRE on MacOS adding Contents/Home to JRE path
+				if (platform.equals(Platform.mac)) {
+					
+					File fixedJreFolder = new File(specificJreFolder, "Contents/Home");
+					if (JDKUtils.isValidJRE(platform, fixedJreFolder)) {
+						specificJreFolder = fixedJreFolder;
+						Logger.warn("Specified 'jrePath' fixed: " + specificJreFolder);
+					}
+				
+				}
+				
 			}
-			
+
 			// removes old jre folder from bundle
 			if (destinationFolder.exists()) FileUtils.removeFolder(destinationFolder);
 
 			// copies JRE folder to bundle
 			FileUtils.copyFolderContentToFolder(specificJreFolder, destinationFolder);
 
-			// sets execution permissions on executables in jre
+			// sets execute permissions on executables in jre
 			File binFolder = new File(destinationFolder, "bin");
 			Arrays.asList(binFolder.listFiles()).forEach(f -> f.setExecutable(true, false));
 
-			// sets execution permissions on jspawnhelper in jre
+			// sets execute permissions on jspawnhelper in jre
 			File libFolder = new File(destinationFolder, "lib");
 			File jshFile = new File(libFolder, "jspawnhelper");
 			if (jshFile.exists()) {

src/main/java/io/github/fvarrui/javapackager/utils/JDKUtils.java

@@ -11,31 +11,33 @@
 import io.github.fvarrui.javapackager.model.Platform;
 
 /**
- * JDK utils 
+ * JDK utils
  */
 public class JDKUtils {
-	
+
 	/**
 	 * Converts "release" file from specified JDK or JRE to map
+	 * 
 	 * @param jdkPath JDK directory path
 	 * @return Map with all properties
-	 * @throws FileNotFoundException release file not found
 	 * @throws IOException release file could not be read
 	 */
-	private static Map<String, String> getRelease(File jdkPath) throws FileNotFoundException, IOException {
+	private static Map<String, String> getRelease(File jdkPath) throws IOException {
 		Map<String, String> propertiesMap = new HashMap<>();
 		File releaseFile = new File(jdkPath, "release");
 		if (!releaseFile.exists()) {
-			throw new FileNotFoundException("release file not found: " + releaseFile); 
+			return propertiesMap;
 		}
 		Properties properties = new Properties();
 		properties.load(new FileInputStream(releaseFile));
 		properties.forEach((key, value) -> propertiesMap.put(key.toString(), value.toString().replaceAll("^\"|\"$", "")));
 		return propertiesMap;
 	}
-	
+
 	/**
-	 * Checks if the platform specified in the "release" file matches the required platform 
+	 * Checks if the platform specified in the "release" file matches the required
+	 * platform
+	 * 
 	 * @param platform
 	 * @param jdkPath
 	 * @return true if JDK is for platform
@@ -46,38 +48,46 @@ private static boolean checkPlatform(Platform platform, File jdkPath) throws Fil
 		Map<String, String> releaseMap = getRelease(jdkPath);
 		String osName = releaseMap.get("OS_NAME");
 		switch (platform) {
-		case linux:		return "Linux".equalsIgnoreCase(osName);
-		case mac:		return "Darwin".equalsIgnoreCase(osName);
-		case windows:	return "Windows".equalsIgnoreCase(osName);
-		default:		return false;
+		case linux:
+			return "Linux".equalsIgnoreCase(osName);
+		case mac:
+			return "Darwin".equalsIgnoreCase(osName);
+		case windows:
+			return "Windows".equalsIgnoreCase(osName);
+		default:
+			return false;
 		}
 	}
-	
+
 	/**
 	 * Checks if a JDK is for platform
+	 * 
 	 * @param platform Specific platform
 	 * @param jdkPath Path to the JDK folder
 	 * @return true if is valid, otherwise false
-	 * @throws FileNotFoundException Path to JDK not found 
+	 * @throws FileNotFoundException Path to JDK not found
 	 * @throws IOException Error reading JDK "release" file
 	 */
 	public static boolean isValidJDK(Platform platform, File jdkPath) throws FileNotFoundException, IOException {
-		return checkPlatform(platform, jdkPath);
+		return jdkPath != null && jdkPath.isDirectory() && checkPlatform(platform, jdkPath);
 	}
-	
+
 	/**
 	 * Checks if a JRE is for platform
+	 * 
 	 * @param platform Specific platform
-	 * @param jrePath Path to the JRE folder
+	 * @param jrePath  Path to the JRE folder
 	 * @return true if is valid, otherwise false
 	 * @throws IOException Error reading JDK "release" file
 	 */
 	public static boolean isValidJRE(Platform platform, File jrePath) throws IOException {
-		try {
-			return checkPlatform(platform, jrePath);
-		} catch (FileNotFoundException e) {
-			return new File(jrePath, "bin/java").exists() || new File(jrePath, "bin/java.exe").exists();
-		}
+		return (
+				jrePath != null && 
+				jrePath.isDirectory() &&
+				(checkPlatform(platform, jrePath) || 
+				new File(jrePath, "bin/java").exists() || 
+				new File(jrePath, "bin/java.exe").exists())
+			);
 	}
 
 }