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

feat(FindJavaPaths): also use asdf to find Java

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

10
launcher/java/JavaUtils.cpp
View File

@ -385,6 +385,13 @@ QList<QString> JavaUtils::FindJavaPaths()
for (const QString& java : sdkmanJavas) {
javas.append(sdkmanJavaDir.absolutePath() + "/" + java + "/bin/java");
}
// javas downloaded by asdf
QString asdfDataDir = qEnvironmentVariable("ASDF_DATA_DIR", FS::PathCombine(home, ".asdf"));
QDir asdfJavaDir(FS::PathCombine(asdfDataDir, "installs/java"));
QStringList asdfJavas = asdfJavaDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
for (const QString& java : asdfJavas) {
javas.append(asdfJavaDir.absolutePath() + "/" + java + "/bin/java");
}
// java in user library folder (like from intellij downloads)
@ -472,6 +479,9 @@ QList<QString> JavaUtils::FindJavaPaths()
// javas downloaded by sdkman
QString sdkmanDir = qEnvironmentVariable("SDKMAN_DIR", FS::PathCombine(home, ".sdkman"));
scanJavaDirs(FS::PathCombine(sdkmanDir, "candidates/java"));
// javas downloaded by asdf
QString asdfDataDir = qEnvironmentVariable("ASDF_DATA_DIR", FS::PathCombine(home, ".asdf"));
scanJavaDirs(FS::PathCombine(asdfDataDir, "installs/java"));
// javas downloaded by gradle (toolchains)
scanJavaDirs(FS::PathCombine(home, ".gradle/jdks"));