Only use DEFAULT_INSTALL_DIR, not DEFAULT_INI_DIR.
This commit is contained in:
@@ -62,7 +62,7 @@ QString branchName() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
|
std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
|
||||||
std::unique_ptr<QSettings> settings{std::make_unique<QSettings>()};
|
std::unique_ptr<QSettings> settings;
|
||||||
|
|
||||||
//QString const fileName{settings->applicationName() + ".ini"};
|
//QString const fileName{settings->applicationName() + ".ini"};
|
||||||
QString const fileName{"ATBUpdateTool.ini"};
|
QString const fileName{"ATBUpdateTool.ini"};
|
||||||
@@ -71,33 +71,17 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
|
|||||||
if (!optionalDirName.isEmpty()) {
|
if (!optionalDirName.isEmpty()) {
|
||||||
d = QDir{optionalDirName};
|
d = QDir{optionalDirName};
|
||||||
if (d.exists()) { // try to find ini-file under optionalDirname
|
if (d.exists()) { // try to find ini-file under optionalDirname
|
||||||
QFileInfo fi{d, optionalDirName};
|
QFileInfo fi{QDir::cleanPath(optionalDirName + QDir::separator() + fileName)};
|
||||||
if (fi.exists()) {
|
if (fi.exists()) {
|
||||||
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
|
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
|
||||||
return settings;
|
return settings;
|
||||||
} else {
|
} else {
|
||||||
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
|
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found.";
|
||||||
<< "Try" << internal::DEFAULT_INI_DIR;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
qCritical().noquote() << "read" << fileName << ":" << optionalDirName << "not found."
|
qCritical().noquote() << optionalDirName << "not found. Try" << internal::DEFAULT_INSTALL_DIR;
|
||||||
<< "Try" << internal::DEFAULT_INSTALL_DIR;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
d = internal::DEFAULT_INI_DIR;
|
|
||||||
if (d.exists()) { // try to find ini-file under /etc/tools/atbupdate
|
|
||||||
QFileInfo fi{d, fileName};
|
|
||||||
if (fi.exists()) {
|
|
||||||
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
|
|
||||||
return settings;
|
|
||||||
} else {
|
|
||||||
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
|
|
||||||
<< "Try" << internal::DEFAULT_INSTALL_DIR;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical().noquote() << "read" << fileName << ":" << internal::DEFAULT_INI_DIR << "not found."
|
|
||||||
<< "Try" << internal::DEFAULT_INSTALL_DIR;
|
|
||||||
}
|
|
||||||
d = QDir{internal::DEFAULT_INSTALL_DIR};
|
d = QDir{internal::DEFAULT_INSTALL_DIR};
|
||||||
if (d.exists()) { // try to find ini-file under /opt/app/tools/atbupdate
|
if (d.exists()) { // try to find ini-file under /opt/app/tools/atbupdate
|
||||||
QFileInfo fi{d, fileName};
|
QFileInfo fi{d, fileName};
|
||||||
|
Reference in New Issue
Block a user