diff options
| author | BalkanMadman <zurabid2016@gmail.com> | 2023-02-04 16:48:06 +0200 |
|---|---|---|
| committer | BalkanMadman <zurabid2016@gmail.com> | 2023-02-04 16:48:06 +0200 |
| commit | c125c96e8851b0386756b34102b97ad87dc13680 (patch) | |
| tree | b80d70b9bd7c0bfad6b53f2b3663a8875ddb359b /launcher/java | |
| parent | d2fd0fd8e896e3d5dc0449ae719fdaa7d27968a5 (diff) | |
| download | PrismLauncher-c125c96e8851b0386756b34102b97ad87dc13680.tar.gz PrismLauncher-c125c96e8851b0386756b34102b97ad87dc13680.tar.bz2 PrismLauncher-c125c96e8851b0386756b34102b97ad87dc13680.zip | |
Java installations detection fix for Linux
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 5efbc7a8..e55663aa 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -412,8 +412,6 @@ QList<QString> JavaUtils::FindJavaPaths() #elif defined(Q_OS_LINUX) QList<QString> JavaUtils::FindJavaPaths() { - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - QList<QString> javas; javas.append(this->GetDefaultJava()->path); auto scanJavaDir = [&](const QString & dirPath) @@ -421,20 +419,11 @@ QList<QString> JavaUtils::FindJavaPaths() QDir dir(dirPath); if(!dir.exists()) return; - auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); + auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); for(auto & entry: entries) { - QString prefix; - if(entry.isAbsolute()) - { - prefix = entry.absoluteFilePath(); - } - else - { - prefix = entry.filePath(); - } - + prefix = entry.canonicalFilePath(); javas.append(FS::PathCombine(prefix, "jre/bin/java")); javas.append(FS::PathCombine(prefix, "bin/java")); } |