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

Merge pull request #2635 from Izder456/develop

Browse Source 
FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on …
This commit is contained in:
Alexandru Ionut Tripon 2024-07-13 11:16:35 +03:00 committed by GitHub
commit 2df5d4012c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/java/JavaUtils.cpp
View File

@ -394,7 +394,7 @@ QList<QString> JavaUtils::FindJavaPaths()
return javas; return javas;
} }
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
QList<QString> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QList<QString> javas; QList<QString> javas;
@ -419,6 +419,7 @@ QList<QString> JavaUtils::FindJavaPaths()
scanJavaDir(snap + dirPath); scanJavaDir(snap + dirPath);
} }
}; };
#if defined(Q_OS_LINUX)
// oracle RPMs // oracle RPMs
scanJavaDirs("/usr/java"); scanJavaDirs("/usr/java");
// general locations used by distro packaging // general locations used by distro packaging
@ -437,7 +438,10 @@ QList<QString> JavaUtils::FindJavaPaths()
scanJavaDirs("/opt/ibm"); // IBM Semeru Certified Edition scanJavaDirs("/opt/ibm"); // IBM Semeru Certified Edition
// flatpak // flatpak
scanJavaDirs("/app/jdk"); scanJavaDirs("/app/jdk");
#elif defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD)
// ports install to /usr/local on OpenBSD & FreeBSD
scanJavaDirs("/usr/local");
#endif
auto home = qEnvironmentVariable("HOME"); auto home = qEnvironmentVariable("HOME");
// javas downloaded by IntelliJ // javas downloaded by IntelliJ