dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2962 from AOSC-Tracking/upstream/detect-aosc-os-jdks

Browse source 
javautils: add a filter for detecting Java paths on AOSC OS
This commit is contained in:
Alexandru Ionut Tripon 2024-11-19 13:44:57 +02:00 • committed by GitHub
commit e5a4dfdf16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
launcher/java/JavaUtils.cpp
View file

@ -442,9 +442,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