43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From dd86aeec69a1e6c594cb761cbf1ec7145a7b8584 Mon Sep 17 00:00:00 2001
|
|
From: peijiankang <peijiankang@kylinos.cn>
|
|
Date: Fri, 24 Jun 2022 09:55:22 +0800
|
|
Subject: [PATCH] modify version of kylin-scanner is null
|
|
|
|
---
|
|
src/main.cpp | 18 +++++++++++++++---
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/main.cpp b/src/main.cpp
|
|
index cbf0f6a..2d270b2 100644
|
|
--- a/src/main.cpp
|
|
+++ b/src/main.cpp
|
|
@@ -372,10 +372,22 @@ static bool checkStarted()
|
|
static QString getAppVersion()
|
|
{
|
|
QProcess process;
|
|
- process.start(QString("dpkg-parsechangelog -l %1 --show-field Version").arg(CHANGELOG_PATH));
|
|
+ QString result;
|
|
+ QStringList options;
|
|
+ options << "-q" << "kylin-scanner";
|
|
+ process.start("rpm", options);
|
|
process.waitForFinished();
|
|
- QByteArray result = process.readAllStandardOutput();
|
|
- result = result.left(result.length()-1);
|
|
+ QString dpkgInfo = process.readAll();
|
|
+ QStringList infoList = dpkgInfo.split("\n");
|
|
+ for (int n = 0; n < infoList.size(); n++) {
|
|
+ QString strInfoLine = infoList[n];
|
|
+ if (strInfoLine.contains("kylin-scanner")) {
|
|
+ QStringList lineInfoList = strInfoLine.split(QRegExp("-"));
|
|
+ if (lineInfoList.size() >= 3) {
|
|
+ result = lineInfoList[2];
|
|
+ }
|
|
+ }
|
|
+ }
|
|
return result;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|