From 0888c1b525a6e9bef49be32fd4d4dd05746b6006 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 29 Nov 2023 11:29:52 +0100 Subject: [PATCH] Read machine-nr, customer-nr and zone-nr from /mnt/system_data/ rather then the deprecated /etc-directory. --- main.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 88a2d16..7b19f21 100644 --- a/main.cpp +++ b/main.cpp @@ -85,6 +85,12 @@ int main(int argc, char *argv[]) { QString const rtPath = QCoreApplication::applicationDirPath(); + int const machineNr = Utils::read1stLineOfFile("/mnt/system_data/machine_nr"); + int const customerNr = Utils::read1stLineOfFile("/mnt/system_data/cust_nr"); + int const zoneNr = Utils::read1stLineOfFile("/mnt/system_data/zone_nr"); + QString const branchName = (zoneNr != 0) + ? QString("zg1/zone%1").arg(zoneNr) : "master"; + qInfo() << "pwd ......................" << rtPath; qInfo() << "repositoryUrl ............" << repositoryUrl; qInfo() << "plugInDir ................" << plugInDir; @@ -99,6 +105,9 @@ int main(int argc, char *argv[]) { qInfo() << "showExtendedVersion ......" << showExtendedVersion; qInfo() << "iniFileName .............." << iniFileName; qInfo() << "extended-version ........." << APP_EXTENDED_VERSION; + qInfo() << "machineNr ................" << machineNr; + qInfo() << "customerNr ..............." << customerNr; + qInfo() << "zoneNr ..................." << zoneNr; if (showExtendedVersion) { printf(APP_EXTENDED_VERSION"\n"); @@ -113,11 +122,6 @@ int main(int argc, char *argv[]) { return 0; } - int machineNr = Utils::read1stLineOfFile("/etc/machine_nr"); - int customerNr = Utils::read1stLineOfFile("/etc/cust_nr"); - int zoneNr = Utils::read1stLineOfFile("/etc/zone_nr"); - QString const branchName = (zoneNr != 0) - ? QString("zg1/zone%1").arg(zoneNr) : "master"; QThread::currentThread()->setObjectName("main thread"); qInfo() << "Main thread" << QThread::currentThreadId();