Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #952 from Scrumplex/fix-pre-post-launch

Browse Source 
Fix variable substitution in pre launch/post exit hooks
This commit is contained in:
LennyMcLennington 2022-07-23 18:06:12 +01:00 committed by GitHub
commit 4596e78df0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
launcher/launch/LaunchTask.cpp
View File

@ -282,35 +282,22 @@ void LaunchTask::emitFailed(QString reason)
Task::emitFailed(reason); Task::emitFailed(reason);
} }
void LaunchTask::substituteVariables(const QStringList &args) const void LaunchTask::substituteVariables(QStringList &args) const
{ {
auto variables = m_instance->getVariables(); auto env = m_instance->createEnvironment();
auto envVariables = QProcessEnvironment::systemEnvironment();
for (auto arg : args) { for (auto key : env.keys())
for (auto key : variables)
{ {
arg.replace("$" + key, variables.value(key)); args.replaceInStrings("$" + key, env.value(key));
}
for (auto env : envVariables.keys())
{
arg.replace("$" + env, envVariables.value(env));
}
} }
} }
QString LaunchTask::substituteVariables(const QString &cmd) const void LaunchTask::substituteVariables(QString &cmd) const
{ {
QString out = cmd; auto env = m_instance->createEnvironment();
auto variables = m_instance->getVariables();
for (auto it = variables.begin(); it != variables.end(); ++it) for (auto key : env.keys())
{ {
out.replace("$" + it.key(), it.value()); cmd.replace("$" + key, env.value(key));
} }
auto env = QProcessEnvironment::systemEnvironment();
for (auto var : env.keys())
{
out.replace("$" + var, env.value(var));
}
return out;
} }

4
launcher/launch/LaunchTask.h
View File

@ -105,8 +105,8 @@ public: /* methods */
shared_qobject_ptr<LogModel> getLogModel(); shared_qobject_ptr<LogModel> getLogModel();
public: public:
void substituteVariables(const QStringList &args) const; void substituteVariables(QStringList &args) const;
QString substituteVariables(const QString &cmd) const; void substituteVariables(QString &cmd) const;
QString censorPrivateInfo(QString in); QString censorPrivateInfo(QString in);
protected: /* methods */ protected: /* methods */

7
launcher/launch/steps/PostLaunchCommand.cpp
View File

@ -56,9 +56,10 @@ void PostLaunchCommand::executeTask()
const QString program = args.takeFirst(); const QString program = args.takeFirst();
m_process.start(program, args); m_process.start(program, args);
#else #else
QString postlaunch_cmd = m_parent->substituteVariables(m_command); m_parent->substituteVariables(m_command);
emit logLine(tr("Running Post-Launch command: %1").arg(postlaunch_cmd), MessageLevel::Launcher);
m_process.start(postlaunch_cmd); emit logLine(tr("Running Post-Launch command: %1").arg(m_command), MessageLevel::Launcher);
m_process.start(m_command);
#endif #endif
} }

7
launcher/launch/steps/PreLaunchCommand.cpp
View File

@ -56,9 +56,10 @@ void PreLaunchCommand::executeTask()
const QString program = args.takeFirst(); const QString program = args.takeFirst();
m_process.start(program, args); m_process.start(program, args);
#else #else
QString prelaunch_cmd = m_parent->substituteVariables(m_command); m_parent->substituteVariables(m_command);
emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::Launcher);
m_process.start(prelaunch_cmd); emit logLine(tr("Running Pre-Launch command: %1").arg(m_command), MessageLevel::Launcher);
m_process.start(m_command);
#endif #endif
} }