AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-09-23 11:14:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(FindJavaPaths): use SDKMAN_DIR env var to find sdkman installations

Browse Source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2025-09-21 13:44:38 +05:00
parent 28b755cf04
commit 542ad146ad
No known key found for this signature in database
GPG Key ID: B77C34313AEE1FFF
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/java/JavaUtils.cpp
View File

@ -379,10 +379,12 @@ QList<QString> JavaUtils::FindJavaPaths()
auto home = qEnvironmentVariable("HOME"); auto home = qEnvironmentVariable("HOME");
// javas downloaded by sdkman // javas downloaded by sdkman
QDir sdkmanDir(FS::PathCombine(home, ".sdkman/candidates/java")); QString sdkmanDir = qEnvironmentVariable("SDKMAN_DIR", FS::PathCombine(home, ".sdkman"));
QStringList sdkmanJavas = sdkmanDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); QDir sdkmanJavaDir(FS::PathCombine(sdkmanDir, "candidates/java"));
QStringList sdkmanJavas = sdkmanJavaDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
for (const QString& java : sdkmanJavas) { for (const QString& java : sdkmanJavas) {
javas.append(sdkmanDir.absolutePath() + "/" + java + "/bin/java"); javas.append(sdkmanJavaDir.absolutePath() + "/" + java + "/bin/java");
}
} }
// java in user library folder (like from intellij downloads) // java in user library folder (like from intellij downloads)
@ -468,7 +470,8 @@ QList<QString> JavaUtils::FindJavaPaths()
// javas downloaded by IntelliJ // javas downloaded by IntelliJ
scanJavaDirs(FS::PathCombine(home, ".jdks")); scanJavaDirs(FS::PathCombine(home, ".jdks"));
// javas downloaded by sdkman // javas downloaded by sdkman
scanJavaDirs(FS::PathCombine(home, ".sdkman/candidates/java")); QString sdkmanDir = qEnvironmentVariable("SDKMAN_DIR", FS::PathCombine(home, ".sdkman"));
scanJavaDirs(FS::PathCombine(sdkmanDir, "candidates/java"));
// javas downloaded by gradle (toolchains) // javas downloaded by gradle (toolchains)
scanJavaDirs(FS::PathCombine(home, ".gradle/jdks")); scanJavaDirs(FS::PathCombine(home, ".gradle/jdks"));