Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-30 06:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

javautils: add a filter for detecting Java paths on AOSC OS

Browse Source 
Signed-off-by: Kaiyang Wu <origincode@aosc.io>
This commit is contained in:
Kaiyang Wu 2024-06-17 22:41:46 -07:00 committed by Kaiyang Wu
parent a43ebefc97
commit 3d82bc37af
No known key found for this signature in database
GPG Key ID: 357F978888888888
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/java/JavaUtils.cpp
View File

@ -440,9 +440,15 @@ QList<QString> JavaUtils::FindJavaPaths()
QString fileName = info.fileName(); QString fileName = info.fileName();
return fileName.startsWith("openjdk-") || fileName.startsWith("openj9-"); return fileName.startsWith("openjdk-") || fileName.startsWith("openj9-");
}; };
// AOSC OS's locations for openjdk
auto aoscFilter = [](const QFileInfo& info) {
QString fileName = info.fileName();
return fileName == "java" || fileName.startsWith("java-");
};
scanJavaDir("/usr/lib64", gentooFilter); scanJavaDir("/usr/lib64", gentooFilter);
scanJavaDir("/usr/lib", gentooFilter); scanJavaDir("/usr/lib", gentooFilter);
scanJavaDir("/opt", gentooFilter); scanJavaDir("/opt", gentooFilter);
scanJavaDir("/usr/lib", aoscFilter);
// javas stored in Prism Launcher's folder // javas stored in Prism Launcher's folder
scanJavaDirs("java"); scanJavaDirs("java");
// manually installed JDKs in /opt // manually installed JDKs in /opt