set version to 1.5.9

removed restart of apism in case ISMAS is unreachable
script to be started if update-tool finished unexpectedly
2025-06-16 13:39:03 +02:00 · 2025-06-16 13:34:51 +02:00 · 2025-05-20 14:19:57 +02:00 · 2025-05-16 08:42:50 +02:00 · 2025-05-16 08:40:13 +02:00 · 2025-05-14 10:44:09 +02:00
12 changed files with 473 additions and 80 deletions
--- a/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
+++ b/UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro
@@ -138,7 +138,19 @@ 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.
+# 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
--- a/UpdatePTUDevCtrl/git/git_client.cpp
+++ b/UpdatePTUDevCtrl/git/git_client.cpp
@@ -393,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();
--- a/UpdatePTUDevCtrl/ismas/ismas_client.cpp
+++ b/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,9 +803,11 @@ 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(),

-    qInfo() << buf;
+        psa.ptuPackageVersion.toStdString().c_str());
+
+        qInfo() << buf;

    return buf;
 }
--- a/UpdatePTUDevCtrl/ismas/ismas_client.h
+++ b/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";
--- a/UpdatePTUDevCtrl/main.cpp
+++ b/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")) {
--- a/UpdatePTUDevCtrl/mainwindow.cpp
+++ b/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;
--- a/UpdatePTUDevCtrl/mainwindow.h
+++ b/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
--- a/UpdatePTUDevCtrl/mainwindow.ui
+++ b/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,55 +25,47 @@
   <string>MainWindow</string>
  </property>
  <widget class="QWidget" name="centralwidget">
-   <widget class="QWidget" name="layoutWidget">
-    <property name="geometry">
-     <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">
-       <property name="text">
-        <string>Exit</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QProgressBar" name="updateProgress">
-       <property name="value">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" rowspan="3" colspan="3">
-      <widget class="QTextEdit" name="updateStatus">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="font">
-        <font>
-         <family>Misc Fixed</family>
-         <pointsize>11</pointsize>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="verticalScrollBarPolicy">
-        <enum>Qt::ScrollBarAsNeeded</enum>
-       </property>
-       <property name="horizontalScrollBarPolicy">
-        <enum>Qt::ScrollBarAsNeeded</enum>
-       </property>
-       <property name="sizeAdjustPolicy">
-        <enum>QAbstractScrollArea::AdjustToContents</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="3" column="2">
+       <widget class="QPushButton" name="exit">
+        <property name="text">
+         <string>Exit</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QProgressBar" name="updateProgress">
+        <property name="value">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" rowspan="3" colspan="3">
+       <widget class="QTextEdit" name="updateStatus">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="font">
+         <font>
+          <family>Misc Fixed</family>
+          <pointsize>11</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
  </widget>
 </widget>
 <resources/>
--- a/UpdatePTUDevCtrl/utils.cpp
+++ b/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) {
--- a/UpdatePTUDevCtrl/worker.cpp
+++ b/UpdatePTUDevCtrl/worker.cpp
@@ -18,6 +18,7 @@
 #include <Qt>
 #include <QScopedPointer>
 #include <QRegularExpression>
+#include <QJsonArray>

 #include "message_handler.h"
 #include <DeviceController/interfaces.h>
@@ -141,14 +142,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)
@@ -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)) {
@@ -1420,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;
 }
--- a/UpdatePTUDevCtrl/worker.h
+++ b/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;
--- a/on_update_failure.sh
+++ b/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
Author	SHA1	Message	Date
Gerhard Hoffmann	5a2ced4a96	set version to 1.5.9	2025-06-16 13:39:03 +02:00
Gerhard Hoffmann	3b3456196f	removed restart of apism in case ISMAS is unreachable	2025-06-16 13:34:51 +02:00
Gerhard Hoffmann	c63fa92ff7	script to be started if update-tool finished unexpectedly	2025-05-20 14:19:57 +02:00
Gerhard Hoffmann	42624409ba	set version to 1.5.8	2025-05-16 08:42:50 +02:00
Gerhard Hoffmann	c49ff5045b	set version to 1.5.7	2025-05-16 08:40:13 +02:00
Gerhard Hoffmann	358fd80c47	Use applicationPid() of update-tool as event-id. (used by christian)	2025-05-14 10:44:09 +02:00
Gerhard Hoffmann	8a2d710cf8	Use pid of update-tool as event-id. (used by christian)	2025-05-14 10:42:27 +02:00
Gerhard Hoffmann	1ea1cdc3e6	set version to 1.5.7 after merge of pu/portrait	2025-02-19 12:08:17 +01:00
Siegfried Siegert	348fb15508	Ui: support portrait mode	2025-02-19 11:39:08 +01:00
Gerhard Hoffmann	061c57ef51	set verion to 1.5.6	2024-11-22 12:59:13 +01:00
Gerhard Hoffmann	e82417dde7	MainWindow::MainWindow(): Add status timer, to show proceeding update, so user does not exit application / restart machine.	2024-11-22 12:55:27 +01:00
Gerhard Hoffmann	1e271201c5	Set version to 1.5.5.	2024-11-21 09:15:33 +01:00
Gerhard Hoffmann	da66d75a45	getPSAInstalled(): call ptuPackagesVersion. Convert returned JSON-array into JsonObject to be appended to CMD_SENDVERSION.	2024-11-21 09:14:05 +01:00
Gerhard Hoffmann	7accabfa53	Add variables for handling ptu-package-versions and append corresponding data to CMD_SENDVERSION.	2024-11-21 09:12:35 +01:00
Gerhard Hoffmann	201a1cbab9	privateUpdate(): Make sure opkg-commands re executed aunder certain error conditions: Failure of customerEnvironment(), filesToUpdate() or syncCustomerRepositoryAndFS().	2024-10-23 13:23:13 +02:00
Gerhard Hoffmann	9a9cce126a	Minor: extended comment	2024-10-23 13:22:42 +02:00
Gerhard Hoffmann	da0fa54d28	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.	2024-10-23 12:58:48 +02:00
Gerhard Hoffmann	1433c107b3	Remove right-justification in customer_id-name. Version: 1.5.3	2024-10-15 16:48:40 +02:00
Gerhard Hoffmann	8e0732cf95	Set version to 1.5.2.	2024-10-08 15:04:08 +02:00
Gerhard Hoffmann	8f6e1fdae7	clean up: remove .gz and .ipk files in /var/cache/opkg	2024-10-08 15:03:43 +02:00
Gerhard Hoffmann	0d00faf493	Remove hard coded (szeged) zone names	2024-07-23 09:28:54 +02:00
Gerhard Hoffmann	5beb235d92	Chop a trailing / of the repository url -> no clean path necessary	2024-07-17 14:50:32 +02:00
Gerhard Hoffmann	a4bb993217	Set version to 1.5.1	2024-07-17 14:06:18 +02:00
Gerhard Hoffmann	50357997c2	Do not use cleanPath() on an url-path	2024-07-17 14:04:53 +02:00