From 8a564b953899418fb5d667c41f469d5dcb5e453e Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Tue, 10 Feb 2026 14:28:13 +0100 Subject: [PATCH] main: use configuration for setting variables ... -> remove wrong default values. -> remove dependency for certain host-names --- UpdatePTUDevCtrl/main.cpp | 45 +++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/UpdatePTUDevCtrl/main.cpp b/UpdatePTUDevCtrl/main.cpp index c8f4770..524f82c 100644 --- a/UpdatePTUDevCtrl/main.cpp +++ b/UpdatePTUDevCtrl/main.cpp @@ -72,39 +72,43 @@ int main(int argc, char *argv[]) { CommandLineParser parser; parser.process(a); + + if (parser.isSet(parser.addHelpOption())) { + parser.showHelp(0); + return 0; + } + parser.readSettings(); QString repositoryUrl = parser.repositoryUrl(); + QString sshKeyFile = parser.sshKeyFile(); + bool strictHostKeyChecking = parser.sshOptionStrictHostKeyChecking(); if (repositoryUrl.endsWith('/')) { repositoryUrl.chop(1); } - QString gitSSHCommand(""); + // default for gitSSHCommand + QString gitSSHCommand = "ssh -i " + sshKeyFile; - if (repositoryUrl.contains("ptu-config.atb-comm.de")) { - QByteArray const v = qgetenv("GIT_SSH_COMMAND"); - if (v.isEmpty()) { - QString sshKeyFile("/opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"); - if (QFileInfo(sshKeyFile).exists()) { - gitSSHCommand = "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"; - if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) { - qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting..."; - return -1; - } - } else { - qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting..."; + strictHostKeyChecking ? gitSSHCommand.append(" -o StrictHostKeyChecking=yes") + : gitSSHCommand.append(" -o StrictHostKeyChecking=no"); + + QByteArray const v = qgetenv("GIT_SSH_COMMAND"); + if (v.isEmpty()) { + if (QFileInfo(sshKeyFile).exists()) { + if (!qputenv("GIT_SSH_COMMAND", QByteArray(gitSSHCommand.toStdString().c_str()))) { + qCritical() << "ERROR: GIT_SSH_COMMAND not put into env. Exiting..."; return -1; } } else { - gitSSHCommand = QString(v.toStdString().c_str()); - qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:" - << gitSSHCommand; - if (gitSSHCommand != "ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig") { - qCritical() << "ERROR" << gitSSHCommand << "wrong. Exiting..."; - return -1; - } + qCritical() << "ERROR ssh-key-file" << sshKeyFile << "does not exists. Exiting..."; + return -1; } + } else { + gitSSHCommand = QString(v.toStdString().c_str()); + qCritical() << "WARNING GIT_SSH_COMMAND already set in enviroment:" + << gitSSHCommand; } QString plugInDir = parser.plugInDir(); @@ -161,7 +165,6 @@ int main(int argc, char *argv[]) { return 0; } - QThread::currentThread()->setObjectName("main thread"); qInfo() << "Main thread" << QThread::currentThreadId();