Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-10-30 00:47:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updater: no-tor-bundle releases platform tag

Browse source
This commit is contained in:
tobtoht 2023-03-01 15:28:09 +01:00
parent fc56589185
commit f01744b436
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/MainWindow.cpp
View file

@ -49,7 +49,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa
{ {
ui->setupUi(this); ui->setupUi(this);
qDebug() << "Platform tag: " << this->getPlatformTag();
// MCWARNING("feather", "Platform tag: " << this->getPlatformTag().toStdString()); // MCWARNING("feather", "Platform tag: " << this->getPlatformTag().toStdString());
// Ensure the destructor is called after closeEvent() // Ensure the destructor is called after closeEvent()
@ -1542,37 +1541,6 @@ void MainWindow::onReportBug(bool checked) {
Utils::externalLinkWarning(this, "https://docs.featherwallet.org/guides/report-an-issue"); Utils::externalLinkWarning(this, "https://docs.featherwallet.org/guides/report-an-issue");
} }
QString MainWindow::getPlatformTag() {
#ifdef Q_OS_MACOS
return "mac";
#endif
#ifdef Q_OS_WIN
#ifdef PLATFORM_INSTALLER
return "win-installer";
#endif
return "win";
#endif
#ifdef Q_OS_LINUX
QString tag = "";
QString arch = QSysInfo::buildCpuArchitecture();
if (arch == "arm64") {
tag += "linux-arm64";
} else if (arch == "arm") {
tag += "linux-arm";
} else {
tag += "linux";
}
if (!qEnvironmentVariableIsEmpty("APPIMAGE")) {
tag += "-appimage";
}
return tag;
#endif
return "";
}
QString MainWindow::getHardwareDevice() { QString MainWindow::getHardwareDevice() {
if (!m_wallet->isHwBacked()) if (!m_wallet->isHwBacked())
return ""; return "";

1
src/MainWindow.h
View file

@ -215,7 +215,6 @@ private:
void setStatusText(const QString &text, bool override = false, int timeout = 1000); void setStatusText(const QString &text, bool override = false, int timeout = 1000);
void showBalanceDialog(); void showBalanceDialog();
QString statusDots(); QString statusDots();
QString getPlatformTag();
void displayWalletErrorMsg(const QString &err); void displayWalletErrorMsg(const QString &err);
QString getHardwareDevice(); QString getHardwareDevice();
void updateTitle(); void updateTitle();

6
src/utils/Updater.cpp
View file

@ -20,6 +20,8 @@ Updater::Updater(QObject *parent) :
{ {
std::string featherWallet = Utils::fileOpen(":/assets/gpg_keys/featherwallet.asc").toStdString(); std::string featherWallet = Utils::fileOpen(":/assets/gpg_keys/featherwallet.asc").toStdString();
m_maintainers.emplace_back(featherWallet); m_maintainers.emplace_back(featherWallet);
qDebug() << "Platform tag: " << this->getPlatformTag();
} }
void Updater::checkForUpdates() { void Updater::checkForUpdates() {
@ -155,6 +157,10 @@ QString Updater::getPlatformTag() {
tag += "-appimage"; tag += "-appimage";
} }
#if !defined(HAS_TOR_BIN)
tag += "-a";
#endif
return tag; return tag;
#endif #endif
return ""; return "";