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

main: use configuration for setting variables ...

Browse Source 
-> remove wrong default values.
 -> remove dependency for certain host-names
This commit is contained in:
Siegfried Siegert
2026-02-10 14:28:13 +01:00
parent d5e62e72d3
commit 8a564b9538
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
UpdatePTUDevCtrl/main.cpp
View File

@@ -72,39 +72,43 @@ int main(int argc, char *argv[]) {
CommandLineParser parser; CommandLineParser parser;
parser.process(a); parser.process(a);
if (parser.isSet(parser.addHelpOption())) {
parser.showHelp(0);
return 0;
}
parser.readSettings(); parser.readSettings();
QString repositoryUrl = parser.repositoryUrl(); QString repositoryUrl = parser.repositoryUrl();
QString sshKeyFile = parser.sshKeyFile();
bool strictHostKeyChecking = parser.sshOptionStrictHostKeyChecking();
if (repositoryUrl.endsWith('/')) { if (repositoryUrl.endsWith('/')) {
repositoryUrl.chop(1); repositoryUrl.chop(1);
} }
QString gitSSHCommand(""); // default for gitSSHCommand
QString gitSSHCommand = "ssh -i " + sshKeyFile;
if (repositoryUrl.contains("ptu-config.atb-comm.de")) { strictHostKeyChecking ? gitSSHCommand.append(" -o StrictHostKeyChecking=yes")
QByteArray const v = qgetenv("GIT_SSH_COMMAND"); : gitSSHCommand.append(" -o StrictHostKeyChecking=no");
if (v.isEmpty()) {
QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"); QByteArray const v = qgetenv("GIT_SSH_COMMAND");
if (QFileInfo(sshKeyFile).exists()) { if (v.isEmpty()) {
gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"; if (QFileInfo(sshKeyFile).exists()) {
if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) { if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) {
qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting..."; qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting...";
return -1;
}
} else {
qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
return -1; return -1;
} }
} else { } else {
gitSSHCommand = QString(v.toStdString().c_str()); qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting...";
qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:" return -1;
<< gitSSHCommand;
if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") {
qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting...";
return -1;
}
} }
} else {
gitSSHCommand = QString(v.toStdString().c_str());
qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:"
<< gitSSHCommand;
} }
QString plugInDir = parser.plugInDir(); QString plugInDir = parser.plugInDir();
@@ -161,7 +165,6 @@ int main(int argc, char *argv[]) {
return 0; return 0;
} }
QThread::currentThread()->setObjectName("main thread"); QThread::currentThread()->setObjectName("main thread");
qInfo() << "Main thread" << QThread::currentThreadId(); qInfo() << "Main thread" << QThread::currentThreadId();