Compare commits
	
		
			21 Commits
		
	
	
		
			1.4.11
			...
			pu/portrai
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						348fb15508
	
				 | 
					
					
						|||
| 061c57ef51 | |||
| e82417dde7 | |||
| 1e271201c5 | |||
| da66d75a45 | |||
| 7accabfa53 | |||
| 201a1cbab9 | |||
| 9a9cce126a | |||
| da0fa54d28 | |||
| 1433c107b3 | |||
| 8e0732cf95 | |||
| 8f6e1fdae7 | |||
| 0d00faf493 | |||
| 5beb235d92 | |||
| a4bb993217 | |||
| 50357997c2 | |||
| c02f0b08ed | |||
| 5da1eff41a | |||
| af89c9fbc1 | |||
| fa7d1ba879 | |||
| 1dc7578645 | 
@@ -1,5 +1,5 @@
 | 
				
			|||||||
[REPOSITORY_URL]
 | 
					[REPOSITORY_URL]
 | 
				
			||||||
repository-url="https://ptu-config.atb-comm.de/ATB"
 | 
					repository-url="gitea@ptu-config.atb-comm.de:ATB/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[DIRECTORIES]
 | 
					[DIRECTORIES]
 | 
				
			||||||
plugin-directory="/usr/lib/"
 | 
					plugin-directory="/usr/lib/"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -135,7 +135,19 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			|||||||
# 1.4.10  : Fix: for the time being, never set the autoRequest-flag to false.
 | 
					# 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
 | 
					# 1.4.11  : Fix: remove hard-coded path to git-repos of gitea in mimbach. Read
 | 
				
			||||||
#           from ATBUpdateTool.ini the url for the gitrepositories.
 | 
					#           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.
 | 
				
			||||||
 | 
					# 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.
 | 
				
			||||||
 | 
					VERSION="1.5.6"
 | 
				
			||||||
# PLANNED TODOS:
 | 
					# PLANNED TODOS:
 | 
				
			||||||
#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
					#   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 | 
				
			||||||
#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
					#   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -393,6 +393,45 @@ std::optional<QString> GitClient::gitPull() {
 | 
				
			|||||||
    if (QDir(m_customerRepository).exists()) {
 | 
					    if (QDir(m_customerRepository).exists()) {
 | 
				
			||||||
        qInfo() << "BRANCH NAME" << m_branchName;
 | 
					        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");
 | 
					        Command c("git pull");
 | 
				
			||||||
        if (c.execute(m_customerRepository)) {
 | 
					        if (c.execute(m_customerRepository)) {
 | 
				
			||||||
            QString const s = c.getCommandResult().trimmed();
 | 
					            QString const s = c.getCommandResult().trimmed();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -690,7 +690,8 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
 | 
				
			|||||||
                "\"libTCP_ZVT_CCPlugin.so\" : {"
 | 
					                "\"libTCP_ZVT_CCPlugin.so\" : {"
 | 
				
			||||||
                    "\"VERSION\" : \"%s\""
 | 
					                    "\"VERSION\" : \"%s\""
 | 
				
			||||||
                "}"
 | 
					                "}"
 | 
				
			||||||
            "}"
 | 
					            "},"
 | 
				
			||||||
 | 
					             "\"PTU-PACKAGE-VERSIONS\" : %s"
 | 
				
			||||||
        "}",
 | 
					        "}",
 | 
				
			||||||
        psa.versionInfo.reason.toStdString().c_str(),
 | 
					        psa.versionInfo.reason.toStdString().c_str(),
 | 
				
			||||||
        psa.versionInfo.created.toStdString().c_str(),
 | 
					        psa.versionInfo.created.toStdString().c_str(),
 | 
				
			||||||
@@ -801,9 +802,11 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
 | 
				
			|||||||
        psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
 | 
					        psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
 | 
				
			||||||
        psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
 | 
					        psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
 | 
				
			||||||
        psa.pluginVersion.prmCalculatePriceConfigUi.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;
 | 
					    return buf;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -77,6 +77,8 @@ struct PSAInstalled {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    DC2C print[32];
 | 
					    DC2C print[32];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString ptuPackageVersion;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    explicit PSAInstalled() {
 | 
					    explicit PSAInstalled() {
 | 
				
			||||||
        tariff.name = "N/A";
 | 
					        tariff.name = "N/A";
 | 
				
			||||||
        tariff.version = "N/A";
 | 
					        tariff.version = "N/A";
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,9 +50,11 @@
 | 
				
			|||||||
// argv[1]: file to send to dc
 | 
					// argv[1]: file to send to dc
 | 
				
			||||||
int main(int argc, char *argv[]) {
 | 
					int main(int argc, char *argv[]) {
 | 
				
			||||||
    QByteArray const value = qgetenv("LC_ALL");
 | 
					    QByteArray const value = qgetenv("LC_ALL");
 | 
				
			||||||
    if (value != "C") {
 | 
					    if (value.isEmpty() || value != "C") {
 | 
				
			||||||
        qputenv("LC_ALL", "C");
 | 
					        qputenv("LC_ALL", "C");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
					    // qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
					    openlog("ATB-UPDATE", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
 | 
				
			||||||
@@ -72,6 +74,38 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
    parser.readSettings();
 | 
					    parser.readSettings();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QString repositoryUrl = parser.repositoryUrl();
 | 
					    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 plugInDir = parser.plugInDir();
 | 
				
			||||||
    QString plugInName = parser.plugInName();
 | 
					    QString plugInName = parser.plugInName();
 | 
				
			||||||
    QString workingDir = parser.workingDir();
 | 
					    QString workingDir = parser.workingDir();
 | 
				
			||||||
@@ -94,6 +128,9 @@ int main(int argc, char *argv[]) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    qInfo() << "pwd ......................" << rtPath;
 | 
					    qInfo() << "pwd ......................" << rtPath;
 | 
				
			||||||
    qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
					    qInfo() << "repositoryUrl ............" << repositoryUrl;
 | 
				
			||||||
 | 
					    if (!gitSSHCommand.isEmpty()) {
 | 
				
			||||||
 | 
					        qInfo() << "GIT_SSH_COMMAND .........." << gitSSHCommand;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    qInfo() << "plugInDir ................" << plugInDir;
 | 
					    qInfo() << "plugInDir ................" << plugInDir;
 | 
				
			||||||
    qInfo() << "plugInName ..............." << plugInName;
 | 
					    qInfo() << "plugInName ..............." << plugInName;
 | 
				
			||||||
    qInfo() << "workingDir ..............." << workingDir;
 | 
					    qInfo() << "workingDir ..............." << workingDir;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,6 +12,9 @@
 | 
				
			|||||||
#include <QScrollBar>
 | 
					#include <QScrollBar>
 | 
				
			||||||
#include <QEvent>
 | 
					#include <QEvent>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QScreen>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
					MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			||||||
    : QMainWindow(parent)
 | 
					    : QMainWindow(parent)
 | 
				
			||||||
@@ -30,6 +33,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			|||||||
    this->statusBar()->setFont(f);
 | 
					    this->statusBar()->setFont(f);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ui->setupUi(this);
 | 
					    ui->setupUi(this);
 | 
				
			||||||
 | 
					    checkOrientation();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ui->updateProgress->setRange(0, 100);
 | 
					    ui->updateProgress->setRange(0, 100);
 | 
				
			||||||
    ui->updateProgress->reset();
 | 
					    ui->updateProgress->reset();
 | 
				
			||||||
@@ -59,6 +63,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			|||||||
    m_exitTimer->setSingleShot(true);
 | 
					    m_exitTimer->setSingleShot(true);
 | 
				
			||||||
    m_exitTimer->start(1800 * 1000);
 | 
					    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(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
 | 
				
			||||||
    connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
 | 
					    connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
 | 
				
			||||||
    connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
 | 
					    connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
 | 
				
			||||||
@@ -76,9 +98,60 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 | 
				
			|||||||
MainWindow::~MainWindow() {
 | 
					MainWindow::~MainWindow() {
 | 
				
			||||||
    delete m_startTimer;
 | 
					    delete m_startTimer;
 | 
				
			||||||
    delete m_exitTimer;
 | 
					    delete m_exitTimer;
 | 
				
			||||||
 | 
					    delete m_statusTimer;
 | 
				
			||||||
    delete ui;
 | 
					    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) {
 | 
					void MainWindow::customEvent(QEvent *event) {
 | 
				
			||||||
    if (event->type() == ProgressEvent::type()) {
 | 
					    if (event->type() == ProgressEvent::type()) {
 | 
				
			||||||
        ProgressEvent *pevent = (ProgressEvent *)event;
 | 
					        ProgressEvent *pevent = (ProgressEvent *)event;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -66,6 +66,12 @@ private:
 | 
				
			|||||||
    void onShowMessage(QString, QString);
 | 
					    void onShowMessage(QString, QString);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Ui::MainWindow *ui;
 | 
					    Ui::MainWindow *ui;
 | 
				
			||||||
 | 
					    void checkOrientation();
 | 
				
			||||||
 | 
					    void setPortraitLayout();
 | 
				
			||||||
 | 
					    void setLandscapeLayout();
 | 
				
			||||||
 | 
					    Qt::ScreenOrientation currentOrientation;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Worker *m_worker;
 | 
					    Worker *m_worker;
 | 
				
			||||||
    int const m_width;
 | 
					    int const m_width;
 | 
				
			||||||
    QTimer *m_startTimer;
 | 
					    QTimer *m_startTimer;
 | 
				
			||||||
@@ -73,5 +79,6 @@ private:
 | 
				
			|||||||
    bool m_progressRunning;
 | 
					    bool m_progressRunning;
 | 
				
			||||||
    //int m_progressValue;
 | 
					    //int m_progressValue;
 | 
				
			||||||
    UpdateDcEvent::UpdateStep m_updateStep;
 | 
					    UpdateDcEvent::UpdateStep m_updateStep;
 | 
				
			||||||
 | 
					    QTimer *m_statusTimer;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
#endif // MAINWINDOW_H
 | 
					#endif // MAINWINDOW_H
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,6 +10,12 @@
 | 
				
			|||||||
    <height>480</height>
 | 
					    <height>480</height>
 | 
				
			||||||
   </rect>
 | 
					   </rect>
 | 
				
			||||||
  </property>
 | 
					  </property>
 | 
				
			||||||
 | 
					  <property name="minimumSize">
 | 
				
			||||||
 | 
					   <size>
 | 
				
			||||||
 | 
					    <width>480</width>
 | 
				
			||||||
 | 
					    <height>480</height>
 | 
				
			||||||
 | 
					   </size>
 | 
				
			||||||
 | 
					  </property>
 | 
				
			||||||
  <property name="font">
 | 
					  <property name="font">
 | 
				
			||||||
   <font>
 | 
					   <font>
 | 
				
			||||||
    <family>Source Code Pro</family>
 | 
					    <family>Source Code Pro</family>
 | 
				
			||||||
@@ -19,55 +25,47 @@
 | 
				
			|||||||
   <string>MainWindow</string>
 | 
					   <string>MainWindow</string>
 | 
				
			||||||
  </property>
 | 
					  </property>
 | 
				
			||||||
  <widget class="QWidget" name="centralwidget">
 | 
					  <widget class="QWidget" name="centralwidget">
 | 
				
			||||||
   <widget class="QWidget" name="layoutWidget">
 | 
					   <layout class="QVBoxLayout" name="verticalLayout">
 | 
				
			||||||
    <property name="geometry">
 | 
					    <item>
 | 
				
			||||||
     <rect>
 | 
					     <layout class="QGridLayout" name="gridLayout">
 | 
				
			||||||
      <x>10</x>
 | 
					      <item row="3" column="2">
 | 
				
			||||||
      <y>10</y>
 | 
					       <widget class="QPushButton" name="exit">
 | 
				
			||||||
      <width>781</width>
 | 
					        <property name="text">
 | 
				
			||||||
      <height>441</height>
 | 
					         <string>Exit</string>
 | 
				
			||||||
     </rect>
 | 
					        </property>
 | 
				
			||||||
    </property>
 | 
					       </widget>
 | 
				
			||||||
    <layout class="QGridLayout" name="gridLayout">
 | 
					      </item>
 | 
				
			||||||
     <item row="3" column="2">
 | 
					      <item row="3" column="1">
 | 
				
			||||||
      <widget class="QPushButton" name="exit">
 | 
					       <widget class="QProgressBar" name="updateProgress">
 | 
				
			||||||
       <property name="text">
 | 
					        <property name="value">
 | 
				
			||||||
        <string>Exit</string>
 | 
					         <number>1</number>
 | 
				
			||||||
       </property>
 | 
					        </property>
 | 
				
			||||||
      </widget>
 | 
					       </widget>
 | 
				
			||||||
     </item>
 | 
					      </item>
 | 
				
			||||||
     <item row="3" column="1">
 | 
					      <item row="0" column="0" rowspan="3" colspan="3">
 | 
				
			||||||
      <widget class="QProgressBar" name="updateProgress">
 | 
					       <widget class="QTextEdit" name="updateStatus">
 | 
				
			||||||
       <property name="value">
 | 
					        <property name="enabled">
 | 
				
			||||||
        <number>1</number>
 | 
					         <bool>true</bool>
 | 
				
			||||||
       </property>
 | 
					        </property>
 | 
				
			||||||
      </widget>
 | 
					        <property name="font">
 | 
				
			||||||
     </item>
 | 
					         <font>
 | 
				
			||||||
     <item row="0" column="0" rowspan="3" colspan="3">
 | 
					          <family>Misc Fixed</family>
 | 
				
			||||||
      <widget class="QTextEdit" name="updateStatus">
 | 
					          <pointsize>11</pointsize>
 | 
				
			||||||
       <property name="enabled">
 | 
					          <weight>75</weight>
 | 
				
			||||||
        <bool>true</bool>
 | 
					          <bold>true</bold>
 | 
				
			||||||
       </property>
 | 
					         </font>
 | 
				
			||||||
       <property name="font">
 | 
					        </property>
 | 
				
			||||||
        <font>
 | 
					        <property name="verticalScrollBarPolicy">
 | 
				
			||||||
         <family>Misc Fixed</family>
 | 
					         <enum>Qt::ScrollBarAsNeeded</enum>
 | 
				
			||||||
         <pointsize>11</pointsize>
 | 
					        </property>
 | 
				
			||||||
         <bold>true</bold>
 | 
					        <property name="horizontalScrollBarPolicy">
 | 
				
			||||||
        </font>
 | 
					         <enum>Qt::ScrollBarAsNeeded</enum>
 | 
				
			||||||
       </property>
 | 
					        </property>
 | 
				
			||||||
       <property name="verticalScrollBarPolicy">
 | 
					       </widget>
 | 
				
			||||||
        <enum>Qt::ScrollBarAsNeeded</enum>
 | 
					      </item>
 | 
				
			||||||
       </property>
 | 
					     </layout>
 | 
				
			||||||
       <property name="horizontalScrollBarPolicy">
 | 
					    </item>
 | 
				
			||||||
        <enum>Qt::ScrollBarAsNeeded</enum>
 | 
					   </layout>
 | 
				
			||||||
       </property>
 | 
					 | 
				
			||||||
       <property name="sizeAdjustPolicy">
 | 
					 | 
				
			||||||
        <enum>QAbstractScrollArea::AdjustToContents</enum>
 | 
					 | 
				
			||||||
       </property>
 | 
					 | 
				
			||||||
      </widget>
 | 
					 | 
				
			||||||
     </item>
 | 
					 | 
				
			||||||
    </layout>
 | 
					 | 
				
			||||||
   </widget>
 | 
					 | 
				
			||||||
  </widget>
 | 
					  </widget>
 | 
				
			||||||
 </widget>
 | 
					 </widget>
 | 
				
			||||||
 <resources/>
 | 
					 <resources/>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -110,19 +110,19 @@ QString Utils::getTariffInfo(QString fileName) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QString Utils::zoneName(quint8 i) {
 | 
					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) {
 | 
					void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,6 +18,7 @@
 | 
				
			|||||||
#include <Qt>
 | 
					#include <Qt>
 | 
				
			||||||
#include <QScopedPointer>
 | 
					#include <QScopedPointer>
 | 
				
			||||||
#include <QRegularExpression>
 | 
					#include <QRegularExpression>
 | 
				
			||||||
 | 
					#include <QJsonArray>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "message_handler.h"
 | 
					#include "message_handler.h"
 | 
				
			||||||
#include <DeviceController/interfaces.h>
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
@@ -141,7 +142,7 @@ Worker::Worker(int customerNr,
 | 
				
			|||||||
               char const *serialInterface,
 | 
					               char const *serialInterface,
 | 
				
			||||||
               char const *baudrate)
 | 
					               char const *baudrate)
 | 
				
			||||||
  : m_customerNr(customerNr)
 | 
					  : 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_machineNr(machineNr)
 | 
				
			||||||
  , m_zoneNr(zoneNr)
 | 
					  , m_zoneNr(zoneNr)
 | 
				
			||||||
  , m_pluginDir(pluginDir)
 | 
					  , m_pluginDir(pluginDir)
 | 
				
			||||||
@@ -456,6 +457,14 @@ void Worker::privateUpdate() {
 | 
				
			|||||||
    //
 | 
					    //
 | 
				
			||||||
    ////////////////////////////////////////////////////////////////////////////
 | 
					    ////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
    if ((continueUpdate = customerEnvironment()) == false) {
 | 
					    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;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    m_versionInfo = m_gc.gitShowReason(m_branchName);
 | 
					    m_versionInfo = m_gc.gitShowReason(m_branchName);
 | 
				
			||||||
@@ -470,6 +479,14 @@ void Worker::privateUpdate() {
 | 
				
			|||||||
    //
 | 
					    //
 | 
				
			||||||
    ////////////////////////////////////////////////////////////////////////////
 | 
					    ////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
    if ((continueUpdate = filesToUpdate()) == false) {
 | 
					    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;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    m_versionInfo = m_gc.gitShowReason(m_branchName);
 | 
					    m_versionInfo = m_gc.gitShowReason(m_branchName);
 | 
				
			||||||
@@ -483,6 +500,14 @@ void Worker::privateUpdate() {
 | 
				
			|||||||
    //
 | 
					    //
 | 
				
			||||||
    ////////////////////////////////////////////////////////////////////////////
 | 
					    ////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
 | 
					    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;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
 | 
					    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
 | 
				
			||||||
@@ -864,7 +889,24 @@ bool Worker::computeFilesToDownload() {
 | 
				
			|||||||
    return (m_filesToDownload.size() > 0);
 | 
					    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() {
 | 
					bool Worker::execOpkgCommands() {
 | 
				
			||||||
 | 
					    if (!cleanUpOpkgCache()) {
 | 
				
			||||||
 | 
					        CONSOLE() << "INFO: some cached opkg files not removed";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    for (int i = 0; i < m_filesToUpdate.size(); ++i) {
 | 
					    for (int i = 0; i < m_filesToUpdate.size(); ++i) {
 | 
				
			||||||
        QString const fName = m_filesToUpdate.at(i);
 | 
					        QString const fName = m_filesToUpdate.at(i);
 | 
				
			||||||
        if (fName.contains("opkg_commands", Qt::CaseInsensitive)) {
 | 
					        if (fName.contains("opkg_commands", Qt::CaseInsensitive)) {
 | 
				
			||||||
@@ -880,10 +922,12 @@ bool Worker::execOpkgCommands() {
 | 
				
			|||||||
                        while (!in.atEnd()) {
 | 
					                        while (!in.atEnd()) {
 | 
				
			||||||
                            QString line = in.readLine();
 | 
					                            QString line = in.readLine();
 | 
				
			||||||
                            // TODO: "^\\s*[#]{0,}$" : empty line or comment line starting with #
 | 
					                            // 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();
 | 
					                                QString opkgCommand = line.trimmed();
 | 
				
			||||||
 | 
					                                qCritical() << "Found opkg-command" << opkgCommand;
 | 
				
			||||||
                                if (!executeOpkgCommand(opkgCommand)) {
 | 
					                                if (!executeOpkgCommand(opkgCommand)) {
 | 
				
			||||||
                                    opkgErrorLst << opkgCommand;
 | 
					                                    opkgErrorLst << opkgCommand;
 | 
				
			||||||
                                } else {
 | 
					                                } else {
 | 
				
			||||||
@@ -1418,5 +1462,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;
 | 
					    return psaInstalled;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -193,6 +193,7 @@ class Worker : public QThread{
 | 
				
			|||||||
    QString m_apismVersion;
 | 
					    QString m_apismVersion;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    bool executeOpkgCommand(QString opkgCommand);
 | 
					    bool executeOpkgCommand(QString opkgCommand);
 | 
				
			||||||
 | 
					    bool cleanUpOpkgCache();
 | 
				
			||||||
    QString getOsVersion() const;
 | 
					    QString getOsVersion() const;
 | 
				
			||||||
    QString getATBQTVersion() const;
 | 
					    QString getATBQTVersion() const;
 | 
				
			||||||
    QString getATBUpdateToolVersion() const;
 | 
					    QString getATBUpdateToolVersion() const;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user