aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@users.noreply.github.com>2021-06-22 19:14:37 +0200
committerGitHub <noreply@github.com>2021-06-22 19:14:37 +0200
commitbc2c6cf03027841f775d4b5891db6c25f2f37161 (patch)
tree20a66d982cbd9ddafd665a78d40059543e62ffc0
parent8179a89103833805d5374399d80a4305be1b8355 (diff)
parentba8af797a9ba5dc102febd7b7d032f03434c5afe (diff)
downloadPrismLauncher-bc2c6cf03027841f775d4b5891db6c25f2f37161.tar.gz
PrismLauncher-bc2c6cf03027841f775d4b5891db6c25f2f37161.tar.bz2
PrismLauncher-bc2c6cf03027841f775d4b5891db6c25f2f37161.zip
Merge pull request #3893 from colbiedison/detect_jdks_in_opt
[Linux] Add detection of manually installed JDKs in /opt
-rw-r--r--api/logic/java/JavaUtils.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
index 5f004a10..ff6a9ac5 100644
--- 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