mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-02-05 16:44:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

no longer force using javaw

Browse Source
This commit is contained in:
huanghongxun 2019-08-20 00:54:12 +08:00
parent 30c27bbb67
commit e2787af044
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/JavaVersion.java
View File

@ -17,9 +17,8 @@
*/ */
package org.jackhuang.hmcl.util.platform; package org.jackhuang.hmcl.util.platform;
import static java.util.Collections.unmodifiableList; import org.jackhuang.hmcl.util.StringUtils;
import static java.util.stream.Collectors.toList; import org.jackhuang.hmcl.util.versioning.VersionNumber;
import static org.jackhuang.hmcl.util.Logging.LOG;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
@ -35,8 +34,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.jackhuang.hmcl.util.StringUtils; import static java.util.Collections.unmodifiableList;
import org.jackhuang.hmcl.util.versioning.VersionNumber; import static java.util.stream.Collectors.toList;
import static org.jackhuang.hmcl.util.Logging.LOG;
/** /**
* Represents a Java installation. * Represents a Java installation.
@ -115,11 +115,6 @@ public final class JavaVersion {
Platform platform = Platform.BIT_32; Platform platform = Platform.BIT_32;
String version = null; String version = null;
// javaw is only used on windows
if ("javaw.exe".equalsIgnoreCase(executable.getFileName().toString())) {
executable = executable.resolveSibling("java.exe");
}
executable = executable.toRealPath(); executable = executable.toRealPath();
Process process = new ProcessBuilder(executable.toString(), "-version").start(); Process process = new ProcessBuilder(executable.toString(), "-version").start();