Merge pull request #1682 from romangraef/addmorejavas

Add more Java installation dirs
2023-10-05 00:44:16 +02:00
parent 024c474658 c6c17036e3
commit a7bdfb5f6b
1 changed files with 8 additions and 0 deletions
--- a/launcher/java/JavaUtils.cpp
+++ b/launcher/java/JavaUtils.cpp
@ -403,6 +403,14 @@ QList<QString> JavaUtils::FindJavaPaths()
    scanJavaDirs("/opt/jdks");
    // flatpak
    scanJavaDirs("/app/jdk");
+
+    auto home = qEnvironmentVariable("HOME");
+
+    // javas downloaded by IntelliJ
+    scanJavaDirs(FS::PathCombine(home, ".jdks"));
+    // javas downloaded by sdkman
+    scanJavaDirs(FS::PathCombine(home, ".sdkman/candidates/java"));
+
    javas = addJavasFromEnv(javas);
    javas.removeDuplicates();
    return javas;