Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-03 17:39:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TorManager: set correct dir when Feather is installed

Browse source
This commit is contained in:
tobtoht 2022-02-25 14:55:39 +01:00
parent dd87b9fe19
commit 87fec5d0f9
No known key found for this signature in database
GPG key ID: 1CADD27F41F45C3C
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/utils/TorManager.cpp
View file

@ -20,7 +20,12 @@ TorManager::TorManager(QObject *parent)
connect(m_checkConnectionTimer, &QTimer::timeout, this, &TorManager::checkConnection); connect(m_checkConnectionTimer, &QTimer::timeout, this, &TorManager::checkConnection);
this->torDir = Config::defaultConfigDir().filePath("tor"); this->torDir = Config::defaultConfigDir().filePath("tor");
this->torDataPath = QDir(this->torDir).filePath("data"); #if defined(PLATFORM_INSTALLER)
// When installed, use directory relative to application path.
this->torDir = QDir(Utils::applicationPath()).filePath("tor");
#endif
this->torDataPath = Config::defaultConfigDir().filePath("tor/data");
m_process.setProcessChannelMode(QProcess::MergedChannels); m_process.setProcessChannelMode(QProcess::MergedChannels);
@ -164,6 +169,11 @@ bool TorManager::unpackBins() {
this->torPath = QDir(this->torDir).filePath(torBin); this->torPath = QDir(this->torDir).filePath(torBin);
#if defined(PLATFORM_INSTALLER)
// We don't need to unpack if Tor was installed using the installer
return true;
#endif
SemanticVersion embeddedVersion = SemanticVersion::fromString(QString(TOR_VERSION)); SemanticVersion embeddedVersion = SemanticVersion::fromString(QString(TOR_VERSION));
SemanticVersion filesystemVersion = this->getVersion(torPath); SemanticVersion filesystemVersion = this->getVersion(torPath);
qDebug() << QString("Tor versions: embedded %1, filesystem %2").arg(embeddedVersion.toString(), filesystemVersion.toString()); qDebug() << QString("Tor versions: embedded %1, filesystem %2").arg(embeddedVersion.toString(), filesystemVersion.toString());