expand env from wrapped cmd
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
c12beb43a0
commit
09a118e85e
3 changed files with 5 additions and 4 deletions
|
@ -307,7 +307,7 @@ QString expandVariables(const QString& input, QProcessEnvironment dict)
|
|||
return result;
|
||||
}
|
||||
|
||||
QString LaunchTask::substituteVariables(QString& cmd) const
|
||||
QString LaunchTask::substituteVariables(QString& cmd, bool isLaunch) const
|
||||
{
|
||||
return expandVariables(cmd, m_instance->createEnvironment());
|
||||
}
|
||||
return expandVariables(cmd, isLaunch ? m_instance->createLaunchEnvironment() : m_instance->createEnvironment());
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ class LaunchTask : public Task {
|
|||
shared_qobject_ptr<LogModel> getLogModel();
|
||||
|
||||
public:
|
||||
QString substituteVariables(QString& cmd) const;
|
||||
QString substituteVariables(QString& cmd, bool isLaunch = false) const;
|
||||
QString censorPrivateInfo(QString in);
|
||||
|
||||
protected: /* methods */
|
||||
|
|
|
@ -131,6 +131,7 @@ void LauncherPartLaunch::executeTask()
|
|||
|
||||
QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
|
||||
if (!wrapperCommandStr.isEmpty()) {
|
||||
wrapperCommandStr = m_parent->substituteVariables(wrapperCommandStr);
|
||||
auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
|
||||
auto wrapperCommand = wrapperArgs.takeFirst();
|
||||
auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue