Skip to content

Commit 4db0a54

Browse files
committed
Capture updater console output
1 parent 25a1c3d commit 4db0a54

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

source/updater/main.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "shared/updates/updates.h"
2424
#include "shared/utils/container.h"
2525
#include "shared/utils/preferences.h"
26+
#include "shared/utils/consolecapture.h"
2627

2728
#include <QApplication>
2829
#include <QQmlApplicationEngine>
@@ -34,6 +35,7 @@
3435
#include <QTemporaryDir>
3536
#include <QRegularExpression>
3637
#include <QQuickStyle>
38+
#include <QStandardPaths>
3739

3840
#include <QDebug>
3941

@@ -74,11 +76,6 @@ QStringList showUpdater(int argc, char *argv[])
7476
QStringLiteral(R"(\1)"));
7577
auto exe = unquotedArguments.at(0);
7678

77-
QApplication::setOrganizationName(QStringLiteral("Graphia"));
78-
QApplication::setOrganizationDomain(QStringLiteral("graphia.app"));
79-
QApplication::setApplicationName(QStringLiteral(PRODUCT_NAME));
80-
QApplication::setApplicationVersion(QStringLiteral(VERSION));
81-
8279
Q_INIT_RESOURCE(shared);
8380
Q_INIT_RESOURCE(update_keys);
8481

@@ -156,6 +153,15 @@ QStringList showUpdater(int argc, char *argv[])
156153
// NOLINTNEXTLINE bugprone-exception-escape
157154
int main(int argc, char *argv[])
158155
{
156+
QApplication::setOrganizationName(QStringLiteral("Graphia"));
157+
QApplication::setOrganizationDomain(QStringLiteral("graphia.app"));
158+
QApplication::setApplicationName(QStringLiteral(PRODUCT_NAME));
159+
QApplication::setApplicationVersion(QStringLiteral(VERSION));
160+
161+
auto consoleOutputFiles = captureConsoleOutput(
162+
QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation),
163+
QStringLiteral("updater"));
164+
159165
QStringList arguments = showUpdater(argc, argv);
160166
if(arguments.isEmpty())
161167
{

0 commit comments

Comments
 (0)