lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 'PROCESSOR_IDENTIFIER' to determine the architecture on Windows

Browse Source
This commit is contained in:
Glavo
2021-10-14 04:39:29 +08:00
committed by Yuhui Huang
parent 21a9d19105
commit 74fd35047c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/Architecture.java
View File

@@ -181,13 +181,17 @@ public enum Architecture {
static { static {
CURRENT_ARCH_NAME = System.getProperty("os.arch"); CURRENT_ARCH_NAME = System.getProperty("os.arch");
CURRENT_ARCH = parseArchName(CURRENT_ARCH_NAME); CURRENT_ARCH = parseArchName(CURRENT_ARCH_NAME);
String sysArchName = null; String sysArchName = null;
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
sysArchName = System.getenv("PROCESSOR_ARCHITECTURE").trim(); String processorIdentifier = System.getenv("PROCESSOR_IDENTIFIER");
if (processorIdentifier != null) {
int idx = processorIdentifier.indexOf(' ');
if (idx > 0) {
sysArchName = processorIdentifier.substring(0, idx);
}
}
} else { } else {
try { try {
Process process = Runtime.getRuntime().exec("/usr/bin/arch"); Process process = Runtime.getRuntime().exec("/usr/bin/arch");