nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup Python search for Mac

Browse Source 
.. PYTHONHOME/bin/python3 not PYTHONHOME/python3 on MacOS when installed
   within the framework directory.
This commit is contained in:
TuxedoFish
2018-02-11 17:06:06 +00:00
parent baf71b79ad
commit 47f439d1bc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Python/PythonEmbed.cpp
View File

@@ -49,6 +49,7 @@ PythonEmbed::~PythonEmbed()
bool PythonEmbed::pythonInstalled(QString &pybin, QString &pypath, QString PYTHONHOME)
{
QStringList names; names<<"python3"<< "bin/python3" << "python" << "bin/python";
QString pythonbinary;
if (PYTHONHOME=="") {
@@ -57,15 +58,11 @@ bool PythonEmbed::pythonInstalled(QString &pybin, QString &pypath, QString PYTHO
QString path = QProcessEnvironment::systemEnvironment().value("PATH", "");
printd("PATH=%s\n", path.toStdString().c_str());
// what is is typically installed as ?
QStringList binarynames;
binarynames << "python3" << "python";
// what we found
QStringList installnames;
// lets search
foreach(QString name, binarynames) {
foreach(QString name, names) {
installnames = Utils::searchPath(path, name, true);
if (installnames.count() >0) break;
}
@@ -81,7 +78,6 @@ bool PythonEmbed::pythonInstalled(QString &pybin, QString &pypath, QString PYTHO
} else {
// look for python3 or python in PYTHONHOME
QStringList names; names<<"python3"<<"python";
#ifdef WIN32
QString ext= QString(".exe");
#else