Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Backport support arch i586 in release file (#693)

Browse source 
Co-authored-by: Gravita <12893402+gravit0@users.noreply.github.com>
This commit is contained in:
microwin7 2024-01-08 11:19:17 +03:00 committed by GitHub
parent 31489a2b24
commit 8762aa470c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java
View file

@ -46,7 +46,7 @@ private JVMHelper() {
public static ARCH getArch(String arch) { public static ARCH getArch(String arch) {
if (arch.equals("amd64") || arch.equals("x86-64") || arch.equals("x86_64")) return ARCH.X86_64; if (arch.equals("amd64") || arch.equals("x86-64") || arch.equals("x86_64")) return ARCH.X86_64;
if (arch.equals("i386") || arch.equals("i686") || arch.equals("x86")) return ARCH.X86; if (arch.equals("i386") || arch.equals("i586") || arch.equals("i686") || arch.equals("x86")) return ARCH.X86;
if (arch.startsWith("armv8") || arch.startsWith("aarch64")) return ARCH.ARM64; if (arch.startsWith("armv8") || arch.startsWith("aarch64")) return ARCH.ARM64;
if (arch.startsWith("arm") || arch.startsWith("aarch32")) return ARCH.ARM32; if (arch.startsWith("arm") || arch.startsWith("aarch32")) return ARCH.ARM32;
throw new InternalError(String.format("Unsupported arch '%s'", arch)); throw new InternalError(String.format("Unsupported arch '%s'", arch));

1
LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java
View file

@ -265,7 +265,6 @@ public static JavaVersion getByPath(Path jvmDir) {
arch = JVMHelper.getArch(archProperty); arch = JVMHelper.getArch(archProperty);
} }
} catch (Throwable ignored) { } catch (Throwable ignored) {
arch = null;
} }
String modulesProperty = getProperty(properties, "MODULES"); String modulesProperty = getProperty(properties, "MODULES");
if(modulesProperty != null) { if(modulesProperty != null) {