set version to 1.5.9

Add status timer, to show proceeding update, so user does not exit
	application / restart machine.

ATBUpdateTool.ini

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

DownloadDCFirmware/main.cpp

@@ -55,7 +55,7 @@ int main(int argc, char **argv) {
     openlog("ATB-UPDATE-DC-FIRMWARE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 
     QApplication a(argc, argv);
-    QApplication::setApplicationName("ATBUpdateTool");
+    QApplication::setApplicationName("ATBDownloadDCFirmware");
     QApplication::setApplicationVersion(APP_VERSION);
 
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
@@ -126,9 +126,10 @@ int main(int argc, char **argv) {
     mw.setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
     // mw.showFullScreen();
 
-    qCritical() << "SHOW";
+    // qCritical() << "SHOW";
 
-    mw.show();
+    // mw.show();
 
-    return a.exec();
+    return 0;
+    // return a.exec();
 }

DownloadDCJsonFiles/update.cpp

@@ -414,10 +414,6 @@ bool Update::downloadJson(enum FileTypeJson type,
         }
     }
 
-    m_hw->dc_autoRequest(false);
-    qDebug() << "SET AUTO-REQUEST=FALSE";
-    QThread::sleep(1);  // make sure the auto-request flag is acknowledged
-
     return ret;
 }
 

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -132,7 +132,25 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           update.
 #           In case there is an automatic update (00:00-04:00) use M0100 instead
 #           of U0002.
-VERSION="1.4.9"
+# 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.
+# 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.
+# 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.
+# 1.5.4   : Try to run opkg-commands even under some error conditions (failure
+#           of customerEnvironment(), filesToUpdate() or
+#           syncCustomerRepositoryAndFS().
+# 1.5.5   : Call into binary ptuPackageVersion to get installed package
+#           versions.
+# 1.5.6   : Show additional update progress info in status bar.
+# 1.5.7   : Add support for dynamic portrait / landscape.
+# 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
+# 1.5.9   : Removed restart of Apism if ISMAS unreachable.
+VERSION="1.5.9"
 # 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

@@ -9,14 +9,15 @@
 #include <QStringList>
 
 
-GitClient::GitClient(QString const &customerNrStr,
+GitClient::GitClient(QString const &customerRepositoryPath,
+                     QString const &customerNrStr,
                      QString const &customerRepository,
                      QString const &workingDirectory,
                      QString const &branchName,
                      QObject *parent)
   : QObject(parent)
   , m_worker(qobject_cast<Worker *>(parent))
-  , m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
+  , m_repositoryPath(customerRepositoryPath)
   , m_customerNr(customerNrStr)
   , m_workingDirectory(workingDirectory)
   , m_branchName(branchName)
@@ -392,6 +393,45 @@ 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. Only the last line is the git message.
+
+        Here an output of running ATBUpdateTool with a corrupted known-hosts-file:
+
+        ...
+        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: ( branchExistsRemotely : 310 ) branch "zg1/zone1" EXISTS REMOTELY. ( "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\n@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\r\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\nIT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\r\nSomeone could be eavesdropping on you right now (man-in-the-middle attack)!\r\nIt is also possible that a host key has just been changed.\r\nThe fingerprint for the ECDSA key sent by the remote host is\nSHA256:vOD5jF2hglGktqLhK9ABxfEjwEgIK68/v9erdT05NDQ.\r\nPlease contact your system administrator.\r\nAdd correct host key in /home/root/.ssh/known_hosts to get rid of this message.\r\nOffending ECDSA key in /home/root/.ssh/known_hosts:1\r\nPassword authentication is disabled to avoid man-in-the-middle attacks.\r\nKeyboard-interactive authentication is disabled to avoid man-in-the-middle attacks.\r\nAgent forwarding is disabled to avoid man-in-the-middle attacks.\r\nX11 forwarding is disabled to avoid man-in-the-middle attacks.\r\nbd4e8da4780b1a7d6be3d3ce8419f43ccf7e706f\trefs/heads/zg1/zone1" )
+        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: EXECUTED "git branch -l" "(runtime 16ms)" with code 0 IN "/opt/app/tools/atbupdate/customer_336"
+        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "UPDATE_STEP::PULL_NEW_BRANCH"
+        Oct 23 14:18:18 ATB_PTU5 ATBUpdateTool[2696]: "BRANCH-NAME zg1/zone1 CONTAINED IN RESULT master\n* zg1/zone1" .....
+
+        The download continues.
+#endif
         Command c("git pull");
         if (c.execute(m_customerRepository)) {
             QString const s = c.getCommandResult().trimmed();

UpdatePTUDevCtrl/git/git_client.h

@@ -22,7 +22,8 @@ class GitClient : public QObject {
     bool copyGitConfigFromMaster();
 
   public:
-    explicit GitClient(QString const &customerNrStr,
+    explicit GitClient(QString const &customerRepositoryUrl,
+                       QString const &customerNrStr,
                        QString const &repositoryPath,
                        QString const &workingDirectory = QCoreApplication::applicationDirPath(),
                        QString const &branchName = "master",

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -21,6 +21,7 @@
 #include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QCoreApplication>
 
 #if 0
 ########################
@@ -380,7 +381,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
         "{"
             "\"REASON\":\"SW_UP\","
             "\"TIMESTAMP\":\"%s\","
-            "\"EVENT_ID\":\"0\","
+            "\"EVENT_ID\":\"%d\","
             "\"EVENT\":\"%s\","
             "\"EVENTSTATE\":1,"
             "\"PARAMETER\": {"
@@ -390,7 +391,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
                 "\"STEP_RESULT\" : \"%s\","
                 "\"VERSION\" : \"%s\""
             "}"
-        "}", ts.toStdString().c_str(), event, percent, resultCode,
+        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
              step, step_result, version);
     return buf;
 }
@@ -690,7 +691,8 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "\"libTCP_ZVT_CCPlugin.so\" : {"
                     "\"VERSION\" : \"%s\""
                 "}"
-            "}"
+            "},"
+             "\"PTU-PACKAGE-VERSIONS\" : %s"
         "}",
         psa.versionInfo.reason.toStdString().c_str(),
         psa.versionInfo.created.toStdString().c_str(),
@@ -801,7 +803,9 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
         psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
-        psa.pluginVersion.tcpZVT.toStdString().c_str());
+        psa.pluginVersion.tcpZVT.toStdString().c_str(),
+
+        psa.ptuPackageVersion.toStdString().c_str());
 
         qInfo() << buf;
 

UpdatePTUDevCtrl/ismas/ismas_client.h

@@ -77,6 +77,8 @@ struct PSAInstalled {
 
     DC2C print[32];
 
+    QString ptuPackageVersion;
+
     explicit PSAInstalled() {
         tariff.name = "N/A";
         tariff.version = "N/A";

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,38 @@ 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")) {
+        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 +128,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/mainwindow.cpp

@@ -12,6 +12,9 @@
 #include <QScrollBar>
 #include <QEvent>
 
+#include <QScreen>
+
+
 
 MainWindow::MainWindow(Worker *worker, QWidget *parent)
     : QMainWindow(parent)
@@ -30,6 +33,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     this->statusBar()->setFont(f);
 
     ui->setupUi(this);
+    checkOrientation();
 
     ui->updateProgress->setRange(0, 100);
     ui->updateProgress->reset();
@@ -59,6 +63,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     m_exitTimer->setSingleShot(true);
     m_exitTimer->start(1800 * 1000);
 
+    m_statusTimer = new QTimer(this);
+    if (m_statusTimer) {
+        connect(m_statusTimer, &QTimer::timeout, [this]() {
+            static QString p(".");
+            QTime const &t = QDateTime::currentDateTime().time();
+            QString s = t.toString(Qt::ISODate);
+            s += ": Update might take several minutes " + p;
+            if (p.length() >= 5) {
+                p = ".";
+            } else {
+                p += ".";
+            }
+            this->statusBar()->showMessage(s);
+        });
+        m_statusTimer->setSingleShot(false);
+        m_statusTimer->start(1000);
+    }
+
     connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
     connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
     connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
@@ -76,9 +98,60 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 MainWindow::~MainWindow() {
     delete m_startTimer;
     delete m_exitTimer;
+    delete m_statusTimer;
     delete ui;
 }
 
+
+// ----------------------------- Ui::LAYOUT setting -------------------------------------
+
+void MainWindow::checkOrientation()
+{
+    QScreen *screen = QGuiApplication::primaryScreen();
+    Qt::ScreenOrientation orientation = screen->orientation();
+
+    switch (orientation) {
+    case Qt::PrimaryOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::LandscapeOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::PortraitOrientation:
+        this->setPortraitLayout();
+        break;
+    case Qt::InvertedLandscapeOrientation:
+        this->setLandscapeLayout();
+        break;
+    case Qt::InvertedPortraitOrientation:
+        this->setPortraitLayout();
+        break;
+    }
+
+    this->currentOrientation = orientation;
+}
+
+
+
+void MainWindow::setPortraitLayout()
+{
+    // Adjust layout for portrait mode (480x800)
+    this->setFixedSize(480, 800);
+    ui->centralwidget->setFixedSize(480, 800);
+}
+
+void MainWindow::setLandscapeLayout()
+{
+    // Adjust layout for landscape mode (800x480)
+    this->setFixedSize(800, 480);
+    ui->centralwidget->setFixedSize(800, 480);
+}
+
+
+
+
+
+
 void MainWindow::customEvent(QEvent *event) {
     if (event->type() == ProgressEvent::type()) {
         ProgressEvent *pevent = (ProgressEvent *)event;

UpdatePTUDevCtrl/mainwindow.h

@@ -66,6 +66,12 @@ private:
     void onShowMessage(QString, QString);
 
     Ui::MainWindow *ui;
+    void checkOrientation();
+    void setPortraitLayout();
+    void setLandscapeLayout();
+    Qt::ScreenOrientation currentOrientation;
+
+
     Worker *m_worker;
     int const m_width;
     QTimer *m_startTimer;
@@ -73,5 +79,6 @@ private:
     bool m_progressRunning;
     //int m_progressValue;
     UpdateDcEvent::UpdateStep m_updateStep;
+    QTimer *m_statusTimer;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/mainwindow.ui

@@ -10,6 +10,12 @@
     <height>480</height>
    </rect>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>480</width>
+    <height>480</height>
+   </size>
+  </property>
   <property name="font">
    <font>
     <family>Source Code Pro</family>
@@ -19,15 +25,8 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QWidget" name="layoutWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="geometry">
+    <item>
-     <rect>
-      <x>10</x>
-      <y>10</y>
-      <width>781</width>
-      <height>441</height>
-     </rect>
-    </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="3" column="2">
        <widget class="QPushButton" name="exit">
@@ -52,6 +51,7 @@
          <font>
           <family>Misc Fixed</family>
           <pointsize>11</pointsize>
+          <weight>75</weight>
           <bold>true</bold>
          </font>
         </property>
@@ -61,13 +61,11 @@
         <property name="horizontalScrollBarPolicy">
          <enum>Qt::ScrollBarAsNeeded</enum>
         </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QAbstractScrollArea::AdjustToContents</enum>
-       </property>
        </widget>
       </item>
      </layout>
-   </widget>
+    </item>
+   </layout>
   </widget>
  </widget>
  <resources/>

UpdatePTUDevCtrl/update.cpp

@@ -193,8 +193,8 @@ bool Update::openSerial(int br, QString baudrate, QString comPort) const {
                       + " " + baudrate + " " + comPort + "...OK");
 
             // m_hw->dc_autoRequest(true);
-            m_hw->dc_autoRequest(false);
+            // m_hw->dc_autoRequest(false);
-            QThread::sleep(1);
+            // QThread::sleep(1);
 
             Utils::printInfoMsg(QString("IS PORT OPEN %1").arg(m_hw->dc_isPortOpen()));
             return true;
@@ -507,9 +507,9 @@ bool Update::downloadJson(enum FileTypeJson type,
             }
         }
 
-        m_hw->dc_autoRequest(false);
+        // m_hw->dc_autoRequest(false);
-        qDebug() << "SET AUTO-REQUEST=FALSE";
+        // qDebug() << "SET AUTO-REQUEST=FALSE";
-        QThread::sleep(1);  // make sure the auto-request flag is acknowledged
+        // QThread::sleep(1);  // make sure the auto-request flag is acknowledged
     }
 
     return true;
@@ -584,8 +584,8 @@ QStringList Update::getDcSoftAndHardWareVersion() {
         QString const &hwVersion = m_hw->dc_getHWversion().toLower().trimmed();
         QString const &swVersion = m_hw->dc_getSWversion().toLower().trimmed();
 
-        m_hw->dc_autoRequest(false);
+        //m_hw->dc_autoRequest(false);
-        QThread::sleep(1); // make sure the timer-slots are inactive
+        //QThread::sleep(1); // make sure the timer-slots are inactive
 
         if (!hwVersion.isEmpty() && !swVersion.isEmpty()) {
             return QStringList() << hwVersion << swVersion;

UpdatePTUDevCtrl/utils.cpp

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

UpdatePTUDevCtrl/worker.cpp

@@ -18,6 +18,7 @@
 #include <Qt>
 #include <QScopedPointer>
 #include <QRegularExpression>
+#include <QJsonArray>
 
 #include "message_handler.h"
 #include <DeviceController/interfaces.h>
@@ -141,7 +142,7 @@ 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)
@@ -157,7 +158,7 @@ Worker::Worker(int customerNr,
   , m_parent(parent)
   , m_serialInterface(serialInterface)
   , m_baudrate(baudrate)
-  , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
+  , m_gc(m_customerRepositoryPath, m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
   , m_versionInfo(QStringList())
   , m_osVersion(getOsVersion())
   , m_atbqtVersion(getATBQTVersion())
@@ -456,6 +457,14 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = customerEnvironment()) == false) {
+        // even if something goes wrong creating the environment, try to execute
+        // opkg_commands
+        if (QDir(m_customerRepository).exists()) {
+            // always execute contents of opkg_commands-file
+            m_filesToUpdate.clear();
+            m_filesToUpdate << "etc/psa_update/opkg_commands";
+            execOpkgCommands();
+        }
         return;
     }
     m_versionInfo = m_gc.gitShowReason(m_branchName);
@@ -470,6 +479,14 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = filesToUpdate()) == false) {
+        // even if something goes wrong in filesToUpdate, try to execute
+        // opkg_commands
+        if (QDir(m_customerRepository).exists()) {
+            // always execute contents of opkg_commands-file
+            m_filesToUpdate.clear();
+            m_filesToUpdate << "etc/psa_update/opkg_commands";
+            execOpkgCommands();
+        }
         return;
     }
     m_versionInfo = m_gc.gitShowReason(m_branchName);
@@ -483,6 +500,14 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
+        // even if something goes wrong with rsync, try to execute
+        // opkg_commands
+        if (QDir(m_customerRepository).exists()) {
+            // always execute contents of opkg_commands-file
+            m_filesToUpdate.clear();
+            m_filesToUpdate << "etc/psa_update/opkg_commands";
+            execOpkgCommands();
+        }
         return;
     }
     lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
@@ -559,16 +584,6 @@ bool Worker::updateTriggerSet() {
             CONSOLE(lst) << UPDATE_STEP::DEBUG;
         }
 
-        if ((repeat % 8) == 0) {
-            CONSOLE(QStringList(func) << "RESTART APISM") << UPDATE_STEP::DEBUG;
-            Command c("systemctl restart apism");
-            if (c.execute("/tmp")) {
-                QThread::sleep(20); // give APISM some time to reconnect
-                QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << "RESTART APISM DONE"));
-                CONSOLE(lst) << UPDATE_STEP::DEBUG;
-            }
-        }
-
         if (std::optional<QString> result
                 = IsmasClient::sendRequestReceiveResponse(
                     IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {
@@ -864,7 +879,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)) {
@@ -880,10 +912,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*#.*$");
+                            static const QRegularExpression comment("^\\s*[#].*$");
-                            if (line.indexOf(comment, 0) == -1) {
+                            static const QRegularExpression emptyLine("^\\s*$");
-                                // found opkg command
+                            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 {
@@ -1418,5 +1452,41 @@ PSAInstalled Worker::getPSAInstalled() {
         }
     }
 
+    psaInstalled.ptuPackageVersion = "{}";
+    if (QFile::exists("/usr/bin/ptuPackageVersions")) {
+        Command c("/usr/bin/ptuPackageVersions -i -o json");
+        if (c.execute(m_workingDirectory)) {
+            QString r = c.getCommandResult();
+            // ptuPackageVersions returns a json-array
+            QJsonArray const &ja = QJsonDocument::fromJson(r.remove(QRegExp("\\n")).toUtf8()).array();
+            if (!ja.empty()) {
+                // transform the array into an object, containing the objects
+                // of the array (christian needs it this way)
+                QJsonObject o;
+                foreach (QJsonValue const &value, ja) {
+                    if (value.isObject()) {
+                        QJsonObject obj = value.toObject();
+                        QStringList keys = obj.keys();
+                        if (!keys.isEmpty()) {
+                            QString const &k = obj.keys().first();
+                            QJsonValue const &v = obj.value(k);
+                            o.insert(k, v);
+                        }
+                    }
+                }
+
+                psaInstalled.ptuPackageVersion =
+                    QJsonDocument(o).toJson(QJsonDocument::Compact);
+
+            } else {
+                qCritical() << __func__ << ":" << __LINE__
+                            << "ERROR array return by ptuPackageVersions empty";
+            }
+        } else {
+            qCritical() << __func__ << ":" << __LINE__
+                        << "ERROR executing ptuPackageVersions";
+        }
+    }
+
     return psaInstalled;
 }

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;

on_update_failure.sh

@@ -0,0 +1,184 @@
+#!/bin/bash
+
+# set -x
+
+#
+#############################################################################
+# Check if the ATBUpdateTool(.service) did not send U0001 (sucess),
+# U0002 (activated) or U0003 (error) to ISMAS, including the case that the
+# tool did not crash or was not killed under other circumstances.
+#
+# This script will be called in the associated atbupdatetool.service (see
+# /lib/systemd/system/atbupdatetool.service).
+#
+###############################################################################
+
+readonly OUT_FILE=/tmp/out.txt
+readonly SCRIPT_NAME=$(basename $0)
+
+if [ -z "$START_DATE" ]
+then
+    START_DATE=$(date +"%Y-%m-%d00:00:00")
+fi
+
+if [ -z "$STOP_DATE" ]
+then
+    STOP_DATE=$(date +"%Y-%m-%d%H:%M:%S")
+fi
+
+echo "EXIT_CODE=$EXIT_CODE"
+echo "SERVICE_RESULT=$SERVICE_RESULT"
+echo "EXIT_STATUS=$EXIT_STATUS"
+echo "START_DATE=$START_DATE"
+echo "STOP_DATE=$STOP_DATE"
+
+
+last_cmd_event () {
+    # output json; look for start of CMD_EVENT; look for }}; extract everything between; finally re-add }}.
+    # could also look for ">>>", but this might change in the future.
+    local json=$(\
+	    journalctl -u atbupdatetool --since="$START_DATE" --until="$STOP_DATE" --output=json-pretty |\
+	    grep "#M=APISM#C=CMD_EVENT#J="                                                              |\
+	    awk '{split($0, a, "#M=APISM#C=CMD_EVENT#J="); print a[2]}'                                 |\
+	    awk '{split($0, a, /\}[\s]*\}/); print a[1]}'                                               |\
+	    tr -d '\\'                                                                                  |\
+	    tail -1)
+    json+="}}"
+    echo "$json"
+}
+
+last_percent_value () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\3/p" | xargs | awk '{print $NF}')
+}
+
+last_step () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[8]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
+}
+
+last_step_result () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[9]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
+}
+
+pid_atbupdatetool () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(ATBUpdateTool\[\)\(\\s*[0-9]\+\)\(\].*$\)/\3/p" | uniq)
+}
+
+last_event () {
+    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[4]}' | awk '{split($0, b, ":"); print b[2]}' | tr -d ' ' | tr -d '"\\') 
+}
+
+sendU0003 () {
+    LAST_CMD_EVENT=$(last_cmd_event)
+    echo "LAST=$LAST_CMD_EVENT"
+    
+    local json_detected=0
+    local temp
+    local x
+
+    if [[ ! -z "$LAST_CMD_EVENT" ]]
+    then
+       temp=$(mktemp -p /tmp)
+       echo "$LAST_CMD_EVENT" > "$temp"
+       x=$(jq .EVENT $temp)
+       if [ $? -eq 0 ]; then
+           json_detected=1
+       fi
+    fi
+
+    if [ $json_detected -eq 1 ]
+    then
+        # local pid=$(jq .EVENT_ID $temp)
+
+	# if json has been detected, use "jq".
+
+        x=$(jq .PARAMETER.PERCENT $temp | tr -d '"')
+        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
+
+        x=$(jq .PARAMETER.STEP $temp | tr -d '"')
+        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
+       
+        x=$(jq .PARAMETER.STEP_RESULT $temp | tr -d '"')
+        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
+    
+        x=$(pid_atbupdatetool)
+        [[ -z "$x" ]] && PID=99999 || PID=$x
+    
+        x=$(last_event)
+        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
+    
+    else 
+        # cannot parse valid json. try original journal text file.
+
+        x=$(last_percent_value)
+        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
+
+        x=$(last_step)
+        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
+    
+        x=$(last_step_result)
+        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
+    
+        x=$(pid_atbupdatetool)
+        [[ -z "$x" ]] && PID=99999 || PID=$x
+
+        x=$(last_event)
+        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
+    fi
+
+    echo "PERCENT=$PERCENT"
+    echo "STEP=$STEP"
+    echo "STEP_RESULT=$STEP_RESULT"
+    echo "PID=$PID"
+    echo "EVENT=$EVENT"
+
+    # build json to be sent to ISMAS with "U0003"
+
+    CURRENT_DATE=$(date +"%Y-%m-%d %H:%M:%S.000%z")
+    U0003Msg="{\
+        \"REASON\":\"SW_UP\",\
+        \"TIMESTAMP\":\"$CURRENT_DATE\",\
+        \"EVENT_ID\":\"$PID\",\
+        \"EVENT\":\"U0003\",\
+        \"EVENTSTATE\":1,\
+        \"PARAMETER\": {\
+            \"PERCENT\" : $PERCENT,\
+            \"RESULTCODE\" : 99,\
+                    \"STEP\" : \"$1 -> monitored last step: $STEP\",\
+                    \"STEP_RESULT\" : \"$1 -> monitored last step result: $STEP_RESULT\",\
+            \"VERSION\" : \"\"\
+        }\
+    }"
+
+    echo -e "U0003Msg=$U0003Msg"
+
+    (echo "#M=APISM#C=CMD_EVENT#J=$U0003Msg"; sleep 5) | nc localhost 7777
+}
+
+# save journal for the last run of atbupdatetool in $OUT_FILE
+echo $(journalctl -u atbupdatetool --since="$START_DATE" --until=$STOP_DATE) > $OUT_FILE
+
+if [[ "$EXIT_CODE" = "exited" && "$SERVICE_RESULT" = "success" && "$EXIT_STATUS" = "0" ]]
+then
+    # almost normal run; at least there was no crash.	
+    if cat $OUT_FILE | grep -o "U0003" | wc -l; then
+        echo "$SCRIPT_NAME: Failure code U0003 already sent to ISMAS"
+        exit 0
+    fi
+
+    if cat $OUT_FILE | grep -o "U0002" | wc -l; then
+        echo "$SCRIPT_NAME: Success code U0002 already sent to ISMAS"
+        exit 0
+    else
+        sendU0003 "$SCRIPT_NAME: Success code U0002 not sent to ISMAS"
+    fi
+
+    if cat $OUT_FILE | grep -o "U0001" | wc -l; then
+        echo "$SCRIPT_NAME: Success code U0001 already sent to ISMAS"
+        exit 0
+    else
+        sendU0003 "$SCRIPT_NAME: Success code U0001 not sent to ISMAS"
+    fi
+else
+    # something unexpected has happened.
+    sendU0003 "$SCRIPT_NAME: EXIT_CODE=$EXIT_CODE;SERVICE_RESULT=$SERVICE_RESULT;EXIT_STATUS=$EXIT_STATUS"
+fi