Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 13:02:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

setting some more testing env

Browse source
This commit is contained in:
dante ruiz 2019-10-11 15:28:35 -07:00
parent e52d2ff342
commit 9f35a3b803
5 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
launchers/qt/src/CommandlineOptions.cpp
View file

@ -26,6 +26,11 @@ void CommandlineOptions::parse(const int argc, char** argv) {
}
}
void CommandlineOptions::append(const std::string& command) {
qDebug() << "appending option: " << QString::fromStdString(command);
_commandlineOptions.push_back(command);
}
CommandlineOptions* CommandlineOptions::getInstance() {
static CommandlineOptions commandlineOptions;
return &commandlineOptions;

1
launchers/qt/src/CommandlineOptions.h
View file

@ -10,6 +10,7 @@ public:
void parse(const int argc, char** argv);
bool contains(const std::string& option);
void append(const std::string& command);
static CommandlineOptions* getInstance();
private:
std::vector<std::string> _commandlineOptions;

12
launchers/qt/src/LauncherState.cpp
View file

@ -230,8 +230,18 @@ void LauncherState::requestBuilds() {
request->send(_networkAccessManager);
}
QString LauncherState::getBuildVersion() {
QString buildVersion { LAUNCHER_BUILD_VERSION };
QProcessEnvironment processEnvironment = QProcessEnvironment::systemEnvironment();
if (processEnvironment.contains("HQ_LAUNCHER_BUILD_VERSION")) {
buildVersion = processEnvironment.value("HQ_LAUNCHER_BUILD_VERSION");
}
return buildVersion;
}
bool LauncherState::shouldDownloadLauncher() {
return _latestBuilds.launcherBuild.latestVersion != atoi(LAUNCHER_BUILD_VERSION);
return _latestBuilds.launcherBuild.latestVersion != getBuildVersion().toInt();
}
void LauncherState::getCurrentClientVersion() {

2
launchers/qt/src/LauncherState.h
View file

@ -94,7 +94,7 @@ public:
void setLastSignupErrorMessage(const QString& msg);
QString getLastSignupErrorMessage() const { return _lastSignupErrorMessage; }
QString getBuildVersion() { return QString(LAUNCHER_BUILD_VERSION); }
QString getBuildVersion();
QString getLastUsedUsername() const { return _lastUsedUsername; }
void setApplicationStateError(QString errorMessage);

10
launchers/qt/src/main.cpp
View file

@ -7,6 +7,7 @@
#include "CommandlineOptions.h"
#include <iostream>
#include <string>
#include <QProcess>
#include "Helper.h"
#ifdef Q_OS_WIN
@ -36,6 +37,7 @@ int main(int argc, char *argv[]) {
Q_INIT_RESOURCE(resources);
cleanLogFile();
qInstallMessageHandler(messageHandler);
bool didUpdate = false;
#ifdef Q_OS_MAC
if (isLauncherAlreadyRunning()) {
return 0;
@ -44,6 +46,7 @@ int main(int argc, char *argv[]) {
if (argc == 3) {
if (hasSuffix(argv[1], "app") && hasSuffix(argv[2], "app")) {
swapLaunchers(argv[1], argv[2]);
didUpdate = true;
}
}
#endif
@ -64,6 +67,13 @@ int main(int argc, char *argv[]) {
}
#endif
QProcessEnvironment processEnvironment = QProcessEnvironment::systemEnvironment();
if (processEnvironment.contains("HQ_LAUNCHER_BUILD_VERSION")) {
if (didUpdate || options->contains("--restart")) {
options->append("--noUpdate");
}
}
Launcher launcher(argc, argv);
return launcher.exec();
}