44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From be119641ce721595df071aa33d631784fd28b504 Mon Sep 17 00:00:00 2001
|
|
From: pei-jiankang <peijiankang@kylinos.cn>
|
|
Date: Thu, 7 Apr 2022 10:03:06 +0800
|
|
Subject: [PATCH] modify version is pull
|
|
|
|
---
|
|
src/util.cpp | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/util.cpp b/src/util.cpp
|
|
index c5aa3aa..951ffa6 100644
|
|
--- a/src/util.cpp
|
|
+++ b/src/util.cpp
|
|
@@ -499,20 +499,20 @@ QString getUsmVersion()
|
|
QString versionText;
|
|
QProcess proc;
|
|
QStringList options;
|
|
- options << "-l" << "|" << "grep" << "ukui-system-monitor";
|
|
- proc.start("dpkg", options);
|
|
+ options << "-qa" << "|" << "grep" << "ukui-system-monitor";
|
|
+ proc.start("rpm", options);
|
|
proc.waitForFinished();
|
|
QString dpkgInfo = proc.readAll();
|
|
QStringList infoList = dpkgInfo.split("\n");
|
|
for (int n = 0; n < infoList.size(); n++) {
|
|
QString strInfoLine = infoList[n];
|
|
if (strInfoLine.contains("ukui-system-monitor")) {
|
|
- QStringList lineInfoList = strInfoLine.split(QRegExp("[\\s]+"));
|
|
+ QStringList lineInfoList = strInfoLine.split(QRegExp("-"));
|
|
if (lineInfoList.size() >= 3) {
|
|
- versionText = lineInfoList[2];
|
|
+ versionText = lineInfoList[3];
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
return versionText;
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
--
|
|
2.33.0
|
|
|