Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-27 12:46:22 +01:00
Code Issues Projects Releases Wiki Activity

Improve Java runtime finder resiliency

Browse Source 
Found some more edge cases in the wild - though to be honest this entire
thing is edge cases. Sometimes /release exists, but the actual binaries
are in /jre/bin; this commit changes behaviour to look for the two
things independently.
This commit is contained in:
Henry Le Grys 2022-04-22 01:10:06 +01:00
parent 79b1289aff
commit 3c4c38ea84
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/src/main/java/com/skcraft/launcher/launch/runtime/JavaRuntimeFinder.java
View File

@ -73,6 +73,7 @@ public final class JavaRuntimeFinder {
}
public static JavaRuntime getRuntimeFromPath(File target) {
// Normalize target to root first
if (target.isFile()) {
// Probably referring directly to bin/java, back up two levels
target = target.getParentFile().getParentFile();
@ -81,20 +82,26 @@ public final class JavaRuntimeFinder {
target = target.getParentFile();
}
{
File jre = new File(target, "jre/release");
if (jre.isFile()) {
target = jre.getParentFile();
}
// Find the release file
File releaseFile = new File(target, "release");
if (!releaseFile.isFile()) {
releaseFile = new File(target, "jre/release");
// may still not exist - parseFromRelease below will return null if so
}
JavaReleaseFile release = JavaReleaseFile.parseFromRelease(target);
// Find the bin folder
File binFolder = new File(target, "bin");
if (!binFolder.isDirectory()) {
binFolder = new File(target, "jre/bin");
}
JavaReleaseFile release = JavaReleaseFile.parseFromRelease(releaseFile.getParentFile());
if (release == null) {
// Make some assumptions...
return new JavaRuntime(target, null, true);
return new JavaRuntime(binFolder.getParentFile(), null, true);
}
return new JavaRuntime(target, release.getVersion(), release.isArch64Bit());
return new JavaRuntime(binFolder.getParentFile(), release.getVersion(), release.isArch64Bit());
}
private static PlatformRuntimeFinder getRuntimeFinder(Environment env) {