Skip to content

Commit

Permalink
Update diagnostics (open-eid#1178)
Browse files Browse the repository at this point in the history
IB-7672

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma authored Apr 19, 2023
1 parent 9e05b51 commit fabe412
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions client/Diagnostics_unix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ QStringList Diagnostics::packages(const QStringList &names, bool withName)
continue;
CFStringRef ver = CFStringRef(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString")));
CFStringRef build = CFStringRef(CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleVersion")));
packages << QStringLiteral("%1 (%2.%3)").arg(name, QString::fromCFString(ver), QString::fromCFString(build));
packages.append(QStringLiteral("%1 (%2.%3)").arg(name, QString::fromCFString(ver), QString::fromCFString(build)));
}
#elif defined(Q_OS_LINUX)
QProcess p;
Expand All @@ -63,7 +63,7 @@ QStringList Diagnostics::packages(const QStringList &names, bool withName)
{
QString ver = QString::fromLocal8Bit( p.readAll().trimmed() );
if( !ver.isEmpty() )
packages << packageName( name, ver, withName );
packages.append(packageName(name, ver, withName));
}
}
#endif
Expand Down Expand Up @@ -127,8 +127,9 @@ void Diagnostics::run()
#ifdef Q_OS_MAC
"digidocpp"
#else
"libdigidoc2", "libdigidocpp1", "qdigidoc", "qesteidutil", "qdigidoc-tera", "firefox-pkcs11-loader",
"chrome-token-signing", "web-eid", "openssl", "libpcsclite1", "pcsc-lite", "opensc", "awp"
"libdigidocpp1", "qdigidoc4", "firefox-pkcs11-loader", "chrome-token-signing", "web-eid",
"libxerces-c3.2", "libxml-security-c20", "libxalan-c111", "libxalan-c112",
"openssl", "libpcsclite1", "pcsc-lite", "opensc", "awp"
#endif
}).join(QStringLiteral("<br />")) << "<br /><br />";
emit update( info );
Expand All @@ -146,7 +147,7 @@ void Diagnostics::run()
info.clear();

QProcess p;
p.start( "lsusb", QStringList() );
p.start(QStringLiteral("lsusb"), QStringList());
p.waitForFinished();
QString cmd = QString::fromLocal8Bit( p.readAll() );
if( !cmd.isEmpty() )
Expand Down

0 comments on commit fabe412

Please sign in to comment.