Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed JavaExtraSearchPaths

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2024-02-18 21:38:31 +02:00
parent a288779790
commit 889f604a41
8 changed files with 0 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
launcher/java/JavaUtils.cpp
View File

@ -338,7 +338,6 @@ QList<QString> JavaUtils::FindJavaPaths()
candidates.append(getMinecraftJavaBundle());
candidates.append(getPrismJavaBundle());
candidates.append(getPrismExtraJavaPaths());
candidates = addJavasFromEnv(candidates);
candidates.removeDuplicates();
return candidates;
@ -366,7 +365,6 @@ QList<QString> JavaUtils::FindJavaPaths()
}
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
@ -420,7 +418,6 @@ QList<QString> JavaUtils::FindJavaPaths()
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas = addJavasFromEnv(javas);
javas.removeDuplicates();
return javas;
@ -435,7 +432,6 @@ QList<QString> JavaUtils::FindJavaPaths()
javas.append(getMinecraftJavaBundle());
javas.append(getPrismJavaBundle());
javas.append(getPrismExtraJavaPaths());
javas.removeDuplicates();
return addJavasFromEnv(javas);
}
@ -521,36 +517,3 @@ QStringList getPrismJavaBundle()
return javas;
}
QStringList getPrismExtraJavaPaths()
{
QList<QString> javas;
QString executable = "java";
#if defined(Q_OS_WIN32)
executable += "w.exe";
#endif
auto scanDir = [&](QString prefix) {
javas.append(FS::PathCombine(prefix, "jre", "bin", executable));
javas.append(FS::PathCombine(prefix, "bin", executable));
javas.append(FS::PathCombine(prefix, executable));
};
auto scanJavaDir = [&](const QString& dirPath) {
QDir dir(dirPath);
if (!dir.exists())
return;
auto entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
for (auto& entry : entries) {
scanDir(entry.canonicalFilePath());
}
};
auto extra_paths = APPLICATION->settings()->get("JavaExtraSearchPaths").toStringList();
for (auto& entry : extra_paths) {
scanDir(entry);
scanJavaDir(entry);
}
return javas;
}

1
launcher/java/JavaUtils.h
View File

@ -27,7 +27,6 @@ QString stripVariableEntries(QString name, QString target, QString remove);
QProcessEnvironment CleanEnviroment();
QStringList getMinecraftJavaBundle();
QStringList getPrismJavaBundle();
QStringList getPrismExtraJavaPaths();
class JavaUtils : public QObject {
Q_OBJECT