ONIMAI-SMP/Launcher
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

(macOS) Added ARM arch JRE detect and install.

Browse Source
This commit is contained in:
r1tsuu 2023-03-02 23:07:55 +02:00
parent ecfe0de0fb
commit 6c9189da23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/js/assetguard.js
View File

@ -302,7 +302,7 @@ class JavaGuard extends EventEmitter {
break break
} }
const url = `https://corretto.aws/downloads/latest/amazon-corretto-${major}-x64-${sanitizedOS}-jdk.${ext}` const url = `https://corretto.aws/downloads/latest/amazon-corretto-${major}-${process.arch.includes("arm") ? "aarch64" : "x64"}-${sanitizedOS}-jdk.${ext}`
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request.head({url, json: true}, (err, resp) => { request.head({url, json: true}, (err, resp) => {
@ -495,6 +495,8 @@ class JavaGuard extends EventEmitter {
let vendorName = props[i].split('=')[1].trim() let vendorName = props[i].split('=')[1].trim()
this.logger.debug(props[i].trim()) this.logger.debug(props[i].trim())
meta.vendor = vendorName meta.vendor = vendorName
} else if (props[i].indexOf('os.arch') > -1) {
meta.isARM = props[i].split('=')[1].trim() === 'aarch64'
} }
} }
@ -856,6 +858,7 @@ class JavaGuard extends EventEmitter {
/** /**
* Attempts to find a valid x64 installation of Java on MacOS. * Attempts to find a valid x64 installation of Java on MacOS.
* If using Apple Silicon
* The system JVM directory is scanned for possible installations. * The system JVM directory is scanned for possible installations.
* The JAVA_HOME enviroment variable and internet plugins directory * The JAVA_HOME enviroment variable and internet plugins directory
* are also scanned and validated. * are also scanned and validated.
@ -894,7 +897,14 @@ class JavaGuard extends EventEmitter {
pathArr = JavaGuard._sortValidJavaArray(pathArr) pathArr = JavaGuard._sortValidJavaArray(pathArr)
if(pathArr.length > 0){ if(pathArr.length > 0){
return pathArr[0].execPath let amd64Path = pathArr.find(({ isARM }) => !isARM).execPath
let armPath = pathArr.find(({ isARM }) => isARM).execPath
if (process.arch.includes("arm")) {
if (armPath) return armPath
// If ARM JRE is not installed, AMD64 JRE still will run through Rosseta2
return amd64Path
}
return pathArr.find(({ isARM }) => !isARM).execPath
} else { } else {
return null return null
} }