github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-22 01:28:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

macos: fix Tor startup

Browse Source
This commit is contained in:
tobtoht
2025-02-21 08:57:11 +01:00
parent dff4752e82
commit 7992d7be9b
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/TorManager.cpp
+13 -3
View File
@@ -20,10 +20,16 @@ TorManager::TorManager(QObject *parent)
connect(m_checkConnectionTimer, &QTimer::timeout, this, &TorManager::checkConnection);
this->torDir = Config::defaultConfigDir().filePath("tor");
#if defined(PLATFORM_INSTALLER)
#if defined(TOR_INSTALLED)
// When installed, use directory relative to application path.
this->torDir = QDir(Utils::applicationPath()).filePath("tor");
#endif
if (QString(FEATHER_TARGET_TRIPLET) == "arm64-apple-darwin" || QString(FEATHER_TARGET_TRIPLET) == "x86_64-apple-darwin") {
QString featherBinaryPath = QCoreApplication::applicationDirPath();
QDir appBinaryDir(featherBinaryPath);
appBinaryDir.cd("..");
this->torDir = appBinaryDir.filePath("bin");
}
this->torDataPath = Config::defaultConfigDir().filePath("tor/data");
@@ -187,11 +193,15 @@ bool TorManager::unpackBins() {
this->torPath = QDir(this->torDir).filePath(torBin);
#if defined(PLATFORM_INSTALLER)
#if defined(TOR_INSTALLED)
// We don't need to unpack if Tor was installed using the installer
return true;
#endif
if (QString(FEATHER_TARGET_TRIPLET) == "arm64-apple-darwin" || QString(FEATHER_TARGET_TRIPLET) == "x86_64-apple-darwin") {
return true;
}
SemanticVersion embeddedVersion = SemanticVersion::fromString(QString(TOR_VERSION));
SemanticVersion filesystemVersion = this->getVersion(torPath);
qDebug() << QString("Tor versions: embedded %1, filesystem %2").arg(embeddedVersion.toString(), filesystemVersion.toString());
@@ -256,7 +266,7 @@ bool TorManager::shouldStartTorDaemon() {
}
// Don't start a Tor daemon if we don't have one
#if !defined(HAS_TOR_BIN) && !defined(PLATFORM_INSTALLER)
#if !defined(HAS_TOR_BIN) && !defined(TOR_INSTALLED)
qWarning() << "Feather built without embedded Tor. Assuming --use-local-tor";
return false;
#endif