Merge pull request #3893 from colbiedison/detect_jdks_in_opt

[Linux] Add detection of manually installed JDKs in /opt
2021-06-22 19:14:37 +02:00 · 2021-06-22 19:14:37 +02:00 · bc2c6cf030
commit bc2c6cf030
parent 8179a89103 ba8af797a9
1 changed files with 3 additions and 0 deletions
--- a/api/logic/java/JavaUtils.cpp
+++ b/api/logic/java/JavaUtils.cpp
@ -381,6 +381,9 @@ QList<QString> JavaUtils::FindJavaPaths()
    scanJavaDir("/usr/lib32/jvm");
    // javas stored in MultiMC's folder
    scanJavaDir("java");
+    // manually installed JDKs in /opt
+    scanJavaDir("/opt/jdk");
+    scanJavaDir("/opt/jdks");
    return javas;
 }
 #else