GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that if everything fails, to check /etc/dc for thedc-binary.

Browse Source
This commit is contained in:
Gerhard Hoffmann
2025-10-02 15:36:09 +02:00
parent d15593c7aa
commit 0fe9ebef66
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/utils_internal.cpp
View File

@@ -124,18 +124,22 @@ std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory,
dcDir = customerRepoDcDir(); dcDir = customerRepoDcDir();
} else { } else {
dcDir = dcDirectory; dcDir = dcDirectory;
} }
} else { } else {
if (!rootDir.endsWith("/etc/dc") && !rootDir.endsWith("/etc/dc/")) {
if (dcDirectory.isEmpty()) { if (dcDirectory.isEmpty()) {
dcDir = QDir::cleanPath(rootDir + QDir::separator() + customerRepoDcDir()); dcDir = QDir::cleanPath(rootDir + QDir::separator() + "etc/dc/");
} else { } else {
dcDir = QDir::cleanPath(rootDir + QDir::separator() + dcDirectory); dcDir = QDir::cleanPath(rootDir + QDir::separator() + dcDirectory);
} }
} else {
dcDir = QDir::cleanPath(rootDir + QDir::separator());
}
} }
if (dcDir.exists()) { if (dcDir.exists()) {
qCritical() << __func__ << __LINE__ << dcDir;
qInfo() << "use" << dcDir.absolutePath() << "as directory (containing dc-binary)";
QFileInfoList fileInfoList = QFileInfoList fileInfoList =
dcDir.entryInfoList(QStringList("*.bin"), dcDir.entryInfoList(QStringList("*.bin"),
@@ -143,7 +147,6 @@ std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory,
QFileInfo dc2cbin{dcDir.absoluteFilePath("dc2c.bin")}; QFileInfo dc2cbin{dcDir.absoluteFilePath("dc2c.bin")};
if (dc2cbin.exists()) { if (dc2cbin.exists()) {
QCryptographicHash md5gen(QCryptographicHash::Md5); QCryptographicHash md5gen(QCryptographicHash::Md5);
@@ -175,7 +178,11 @@ std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory,
} }
} }
} else { } else {
qCritical() << __func__ << __LINE__ << dcDir << "does not exist"; qCritical() << dcDir.absolutePath() << "does not exist";
if (dcDir.absolutePath() != QDir("/etc/dc/").absolutePath()) {
qInfo() << __func__ << __LINE__ << "Try /etc/dc/";
return dcCandidateToInstall("/etc/dc/", "");
}
} }
return dcCandidate; return dcCandidate;