dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

expand env from wrapped cmd

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-11-18 11:18:50 +02:00
parent c12beb43a0
commit 09a118e85e
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/launch/LaunchTask.cpp
View file

@ -307,7 +307,7 @@ QString expandVariables(const QString& input, QProcessEnvironment dict)
return result; 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());
} }

2
launcher/launch/LaunchTask.h
View file

@ -87,7 +87,7 @@ class LaunchTask : public Task {
shared_qobject_ptr<LogModel> getLogModel(); shared_qobject_ptr<LogModel> getLogModel();
public: public:
QString substituteVariables(QString& cmd) const; QString substituteVariables(QString& cmd, bool isLaunch = false) const;
QString censorPrivateInfo(QString in); QString censorPrivateInfo(QString in);
protected: /* methods */ protected: /* methods */

1
launcher/minecraft/launch/LauncherPartLaunch.cpp
View file

@ -131,6 +131,7 @@ void LauncherPartLaunch::executeTask()
QString wrapperCommandStr = instance->getWrapperCommand().trimmed(); QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
if (!wrapperCommandStr.isEmpty()) { if (!wrapperCommandStr.isEmpty()) {
wrapperCommandStr = m_parent->substituteVariables(wrapperCommandStr);
auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr); auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
auto wrapperCommand = wrapperArgs.takeFirst(); auto wrapperCommand = wrapperArgs.takeFirst();
auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand); auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);