Set version to 1.5.0.

ATBUpdateTool.ini

@@ -1,5 +1,5 @@
 [REPOSITORY_URL]
-repository-url="https://ptu-config.atb-comm.de/ATB"
+repository-url="gitea@ptu-config.atb-comm.de:ATB/"
 
 [DIRECTORIES]
 plugin-directory="/usr/lib/"

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -135,7 +135,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.4.10  : Fix: for the time being, never set the autoRequest-flag to false.
 # 1.4.11  : Fix: remove hard-coded path to git-repos of gitea in mimbach. Read
 #           from ATBUpdateTool.ini the url for the gitrepositories.
-VERSION="1.4.11"
+# 1.5.0   : Use ptu-config.atb-comm.de (given in ini-file) as new server for
+#           customer repositories.
+#           Fix: allow empty lines in opkg_commands.
+VERSION="1.5.0"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

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;

UpdatePTUDevCtrl/worker.cpp

@@ -148,7 +148,7 @@ Worker::Worker(int customerNr,
   , m_pluginName(pluginName)
   , m_workingDirectory(workingDirectory)
   , m_branchName(branchName)
-  , m_customerRepositoryPath(QString("%1/%2.git").arg(repositoryUrl).arg(m_customerNrStr))
+  , m_customerRepositoryPath(QDir::cleanPath(QString("%1/%2.git").arg(repositoryUrl).arg(m_customerNrStr)))
   , m_customerRepository(QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr))
   , m_noUpdatePsaHardware(noUpdatePsaHardware)
   , m_alwaysDownloadConfig(alwaysDownloadConfig)
@@ -880,10 +880,12 @@ bool Worker::execOpkgCommands() {
                         while (!in.atEnd()) {
                             QString line = in.readLine();
                             // TODO: "^\\s*[#]{0,}$" : empty line or comment line starting with #
-                            static const QRegularExpression comment("^\\s*#.*$");
-                            if (line.indexOf(comment, 0) == -1) {
-                                // found opkg command
+                            static const QRegularExpression comment("^\\s*[#].*$");
+                            static const QRegularExpression emptyLine("^\\s*$");
+                            if (line.indexOf(emptyLine, 0) == -1 &&
+                                line.indexOf(comment, 0) == -1) {
                                 QString opkgCommand = line.trimmed();
+                                qCritical() << "Found opkg-command" << opkgCommand;
                                 if (!executeOpkgCommand(opkgCommand)) {
                                     opkgErrorLst << opkgCommand;
                                 } else {