ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fixed macOS bundle not using correct Python environment

Browse Source 
* Pass verbose flag to Python indexer if enabled
This commit is contained in:
Eberhard Graether
2019-05-15 14:44:49 +02:00
parent a9887da9f1
commit b5e8c7f452
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/utility/utilityApp.cpp
+16
View File
@@ -4,6 +4,7 @@
#include <QSysInfo>
#include <QThread>
#include <qprocessordetection.h>
#include <QRegularExpression>
#include "License.h"
#include "ApplicationSettings.h"
@@ -28,6 +29,11 @@ std::string utility::executeProcess(const std::string& command, const FilePath&
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1");
process.setEnvironment(envlist);
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command.c_str());
@@ -59,6 +65,11 @@ std::string utility::executeProcessUntilNoOutput(const std::string& command, con
process.setWorkingDirectory(QString::fromStdWString(workingDirectory.wstr()));
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1");
process.setEnvironment(envlist);
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command.c_str());
@@ -141,6 +152,11 @@ int utility::executeProcessAndGetExitCode(
command += " " + QString::fromStdWString(commandArgument);
}
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
QStringList envlist = env.toStringList();
envlist.replaceInStrings(QRegularExpression("^(?i)PATH=(.*)"), "PATH=/opt/local/bin:/usr/local/bin:$HOME/bin:\\1");
process.setEnvironment(envlist);
{
std::lock_guard<std::mutex> lock(s_runningProcessesMutex);
process.start(command);