From: tobtoht Date: Wed, 1 Mar 2023 14:28:09 +0000 (+0100) Subject: updater: no-tor-bundle releases platform tag X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=f01744b436ffa065c8e1eb0ac0f3dd1e5e0d16d1;p=gamesguru%2Ffeather.git updater: no-tor-bundle releases platform tag --- diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 2b638511..457fb538 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -49,7 +49,6 @@ MainWindow::MainWindow(WindowManager *windowManager, Wallet *wallet, QWidget *pa { ui->setupUi(this); - qDebug() << "Platform tag: " << this->getPlatformTag(); // MCWARNING("feather", "Platform tag: " << this->getPlatformTag().toStdString()); // 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"); } -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() { if (!m_wallet->isHwBacked()) return ""; diff --git a/src/MainWindow.h b/src/MainWindow.h index 4b27075f..be84f59c 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -215,7 +215,6 @@ private: void setStatusText(const QString &text, bool override = false, int timeout = 1000); void showBalanceDialog(); QString statusDots(); - QString getPlatformTag(); void displayWalletErrorMsg(const QString &err); QString getHardwareDevice(); void updateTitle(); diff --git a/src/utils/Updater.cpp b/src/utils/Updater.cpp index d76325c2..4cfa07c0 100644 --- a/src/utils/Updater.cpp +++ b/src/utils/Updater.cpp @@ -20,6 +20,8 @@ Updater::Updater(QObject *parent) : { std::string featherWallet = Utils::fileOpen(":/assets/gpg_keys/featherwallet.asc").toStdString(); m_maintainers.emplace_back(featherWallet); + + qDebug() << "Platform tag: " << this->getPlatformTag(); } void Updater::checkForUpdates() { @@ -155,6 +157,10 @@ QString Updater::getPlatformTag() { tag += "-appimage"; } +#if !defined(HAS_TOR_BIN) + tag += "-a"; +#endif + return tag; #endif return "";