Merge pull request #2962 from AOSC-Tracking/upstream/detect-aosc-os-jdks
javautils: add a filter for detecting Java paths on AOSC OS
This commit is contained in:
commit
e5a4dfdf16
1 changed files with 6 additions and 0 deletions
|
@ -442,9 +442,15 @@ QList<QString> JavaUtils::FindJavaPaths()
|
|||
QString fileName = info.fileName();
|
||||
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/lib", gentooFilter);
|
||||
scanJavaDir("/opt", gentooFilter);
|
||||
scanJavaDir("/usr/lib", aoscFilter);
|
||||
// javas stored in Prism Launcher's folder
|
||||
scanJavaDirs("java");
|
||||
// manually installed JDKs in /opt
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue