github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-20 16:48:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMake: add TOR_INSTALLED

Browse Source
This commit is contained in:
tobtoht
2023-04-21 19:10:43 +02:00
parent a89d20887f
commit be5fd97fe0
5 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/TorManager.cpp
+3 -7
View File
@@ -21,7 +21,7 @@ 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
@@ -73,10 +73,6 @@ void TorManager::start() {
}
QFile torFile{this->torPath};
QString alternativeTorFile = QCoreApplication::applicationDirPath() + "/tor";
if (!torFile.exists() && QFileInfo(alternativeTorFile).isFile()) {
this->torPath = alternativeTorFile;
}
qDebug() << QString("Start process: %1").arg(this->torPath);
@@ -190,7 +186,7 @@ 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
@@ -254,7 +250,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