diff --git a/UpdatePTUDevCtrl/main.cpp b/UpdatePTUDevCtrl/main.cpp index a809445..8487f26 100644 --- a/UpdatePTUDevCtrl/main.cpp +++ b/UpdatePTUDevCtrl/main.cpp @@ -50,9 +50,11 @@ // argv[1]: file to send to dc int main(int argc, char *argv[]) { QByteArray const value = qgetenv("LC_ALL"); - if (value != "C") { + if (value.isEmpty() || value != "C") { qputenv("LC_ALL", "C"); } + + // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0"); openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER); @@ -72,6 +74,33 @@ int main(int argc, char *argv[]) { parser.readSettings(); QString repositoryUrl = parser.repositoryUrl(); + QString gitSSHCommand(""); + + 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..."; + 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; + } + } + } + QString plugInDir = parser.plugInDir(); QString plugInName = parser.plugInName(); QString workingDir = parser.workingDir(); @@ -94,6 +123,9 @@ int main(int argc, char *argv[]) { qInfo() << "pwd ......................" << rtPath; qInfo() << "repositoryUrl ............" << repositoryUrl; + if (!gitSSHCommand.isEmpty()) { + qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand; + } qInfo() << "plugInDir ................" << plugInDir; qInfo() << "plugInName ..............." << plugInName; qInfo() << "workingDir ..............." << workingDir;