gitPull():

Add important comment for the case that an remote host key change:
	'git pull' handles the issue itself, and continues to pull the repository
	using the ssh-key provided in the .keys/ directory.

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -138,7 +138,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 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"
+# 1.5.1   : Fix: do not use cleanPath() on a url-address.
+# 1.5.2   : Remove .ipk and .gz files in /var/cache/opkg.
+# 1.5.3   : Build customer_(id) name without right justification.
+VERSION="1.5.3"
 # 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/git/git_client.cpp

@@ -393,6 +393,38 @@ std::optional<QString> GitClient::gitPull() {
     if (QDir(m_customerRepository).exists()) {
         qInfo() << "BRANCH NAME" << m_branchName;
 
+#if 0
+        IMPORTANT COMMENT:
+
+        If remote host keys are changed, then
+
+        export GIT_SSH_COMMAND="ssh -i /opt/app/tools/atbupdate/.keys/id_ed25519_ptuConfig"
+        git pull
+
+        leads to the following warning/error message:
+
+        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+        @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @
+        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+        IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!
+        Someone could be eavesdropping on you right now (man-in-the-middle attack)!
+        It is also possible that a host key has just been changed.
+        The fingerprint for the ECDSA key sent by the remote host is
+        SHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.
+        Please contact your system administrator.
+        Add correct host key in /home/root/.ssh/known_hosts to get rid of this message.
+        Offending ECDSA key in /home/root/.ssh/known_hosts:1
+        Password authentication is disabled to avoid man-in-the-middle attacks.
+        Keyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.
+        Agent forwarding is disabled to avoid man-in-the-middle attacks.
+        X11 forwarding is disabled to avoid man-in-the-middle attacks.
+        Already up to date.
+
+        This first part is from ssh itself, and could not be fetched easily, as this
+        process is gone when git itself starts.
+
+        Only the last line is the git message.
+#endif
         Command c("git pull");
         if (c.execute(m_customerRepository)) {
             QString const s = c.getCommandResult().trimmed();

UpdatePTUDevCtrl/main.cpp

@@ -74,6 +74,11 @@ int main(int argc, char *argv[]) {
     parser.readSettings();
 
     QString repositoryUrl = parser.repositoryUrl();
+
+    if (repositoryUrl.endsWith('/')) {
+        repositoryUrl.chop(1);
+    }
+
     QString gitSSHCommand("");
 
     if (repositoryUrl.contains("ptu-config.atb-comm.de")) {

UpdatePTUDevCtrl/utils.cpp

@@ -110,19 +110,19 @@ QString Utils::getTariffInfo(QString fileName) {
 }
 
 QString Utils::zoneName(quint8 i) {
-    static constexpr char const *zName[] = {
-        "",
-        "purple",
-        "blue",
-        "yellow",
-        "green",
-        "yellow (mars)",
-        "green (mars)"
-    };
-    if (i < (sizeof(zName)/sizeof(char const *))) {
-        return zName[i];
-    }
-    return "N/A";
+    //static constexpr char const *zName[] = {
+    //    "",
+    //    "purple",
+    //    "blue",
+    //    "yellow",
+    //    "green",
+    //    "yellow (mars)",
+    //    "green (mars)"
+    //};
+    //if (i < (sizeof(zName)/sizeof(char const *))) {
+    //    return zName[i];
+    //}
+    return "---";
 }
 
 void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {

UpdatePTUDevCtrl/worker.cpp

@@ -141,14 +141,14 @@ Worker::Worker(int customerNr,
                char const *serialInterface,
                char const *baudrate)
   : m_customerNr(customerNr)
-  , m_customerNrStr(QString("customer_") + QString::number(m_customerNr).rightJustified(3, '0'))
+  , m_customerNrStr(QString("customer_") + QString::number(m_customerNr))
   , m_machineNr(machineNr)
   , m_zoneNr(zoneNr)
   , m_pluginDir(pluginDir)
   , m_pluginName(pluginName)
   , m_workingDirectory(workingDirectory)
   , m_branchName(branchName)
-  , m_customerRepositoryPath(QDir::cleanPath(QString("%1/%2.git").arg(repositoryUrl).arg(m_customerNrStr)))
+  , m_customerRepositoryPath(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)
@@ -864,7 +864,24 @@ bool Worker::computeFilesToDownload() {
     return (m_filesToDownload.size() > 0);
 }
 
+
+bool Worker::cleanUpOpkgCache() {
+    bool removedFiles = true;
+    QDir dir("/var/cache/opkg");
+    if (dir.exists()) {
+        dir.setNameFilters(QStringList() << ".gz" << ".ipk");
+        dir.setFilter(QDir::Files);
+        foreach(QString dirFile, dir.entryList()) {
+            removedFiles &= dir.remove(dirFile);
+        }
+    }
+    return removedFiles;
+}
+
 bool Worker::execOpkgCommands() {
+    if (!cleanUpOpkgCache()) {
+        CONSOLE() << "INFO: some cached opkg files not removed";
+    }
     for (int i = 0; i < m_filesToUpdate.size(); ++i) {
         QString const fName = m_filesToUpdate.at(i);
         if (fName.contains("opkg_commands", Qt::CaseInsensitive)) {

UpdatePTUDevCtrl/worker.h

@@ -193,6 +193,7 @@ class Worker : public QThread{
     QString m_apismVersion;
 
     bool executeOpkgCommand(QString opkgCommand);
+    bool cleanUpOpkgCache();
     QString getOsVersion() const;
     QString getATBQTVersion() const;
     QString getATBUpdateToolVersion() const;