cassidy/GlobalProtect-openconnect
1
0
Fork 0
mirror of https://github.com/yuezk/GlobalProtect-openconnect.git synced 2025-04-02 18:31:50 -04:00
Code Issues Projects Releases Wiki Activity

improve the version check

Browse Source
This commit is contained in:
Kevin Yue 2021-09-18 22:15:39 +08:00
parent f65178eb19
commit 5dceeffc25
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,10 @@
{
"files.associations": {
"qregularexpression": "cpp",
"qfileinfo": "cpp",
"qregularexpressionmatch": "cpp",
"qdatetime": "cpp",
"qprocess": "cpp",
"qobject": "cpp"
}
}

4
GPService/gpservice.cpp
View File

@ -127,9 +127,9 @@ bool GPService::isValidVersion(QString &bin) {
QProcess p; QProcess p;
p.start(bin, QStringList("--version")); p.start(bin, QStringList("--version"));
p.waitForFinished(); p.waitForFinished();
QString output = p.readAllStandardOutput(); QString output = p.readAll();
QRegularExpression re("v(\\d+).*?\\n"); QRegularExpression re("v(\\d+).*?(\\s|\\n)");
QRegularExpressionMatch match = re.match(output); QRegularExpressionMatch match = re.match(output);
if (match.hasMatch()) { if (match.hasMatch()) {