Improve SDKMAN Java installations support; introduce ASDF Java installations auto-detection
Signed-off-by: McModder <me@modder.pw>
This commit is contained in:
parent
3f54396705
commit
02e6667761
@ -448,7 +448,16 @@ QList<QString> JavaUtils::FindJavaPaths()
|
|||||||
scanJavaDir("/opt/jdks");
|
scanJavaDir("/opt/jdks");
|
||||||
// flatpak
|
// flatpak
|
||||||
scanJavaDir("/app/jdk");
|
scanJavaDir("/app/jdk");
|
||||||
scanJavaDir(FS::PathCombine(QDir::homePath(), ".sdkman/candidates/java"));
|
|
||||||
|
// Default SDKMAN directory can be overwritten via SDKMAN_DIR env var (default $HOME/.sdkman)
|
||||||
|
// see https://sdkman.io/install
|
||||||
|
auto sdkmanInstallPath = qEnvironmentVariable("SDKMAN_DIR", FS::PathCombine(QDir::homePath(), ".sdkman"));
|
||||||
|
scanJavaDir(FS::PathCombine(sdkmanInstallPath, "candidates/java"));
|
||||||
|
// Default ASDF directory can be overwritten via ASDF_DIR or ASDF_DATA_DIR env vars (default $HOME/.asdf)
|
||||||
|
// see https://asdf-vm.com/manage/configuration.html#asdf-dir
|
||||||
|
auto asdfDataPath = qEnvironmentVariable("ASDF_DATA_DIR", qEnvironmentVariable("ASDF_DIR", FS::PathCombine(QDir::homePath(), ".asdf")));
|
||||||
|
scanJavaDir(FS::PathCombine(asdfDataPath, "installs/java"));
|
||||||
|
|
||||||
return addJavasFromEnv(javas);
|
return addJavasFromEnv(javas);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user