diff options
author | Fabian Müller <fmueller@owncloud.com> | 2022-11-11 17:16:04 +0300 |
---|---|---|
committer | Fabian Müller <80399010+fmoc@users.noreply.github.com> | 2022-11-11 18:16:08 +0300 |
commit | edeb4f4136a1aea78f0325aa4b79b13973da2326 (patch) | |
tree | 52ffeba2df663275f1957525a7442d6ea953e63d | |
parent | 6832a67f788b93f14f6274d1eb3bfd8eca0331cc (diff) |
Fix AppImages' update check
We changed the updater server's behavior to properly distinguish between different kinds of packaging/bundling, which is novel to the current setup. In future releases, we are going to add this parameter for the other platforms, too, and also stop encoding the architecture into the platform string for Windows.
-rw-r--r-- | src/gui/updater/updater.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/updater/updater.cpp b/src/gui/updater/updater.cpp index 216c54508..acb7e1ea6 100644 --- a/src/gui/updater/updater.cpp +++ b/src/gui/updater/updater.cpp @@ -76,15 +76,7 @@ QUrlQuery Updater::getQueryParams() Theme *theme = Theme::instance(); QString platform = QStringLiteral("stranger"); if (Utility::isLinux()) { -#ifdef WITH_APPIMAGEUPDATER - if (Utility::runningInAppImage()) { - platform = QStringLiteral("linux-appimage-") + QSysInfo::buildCpuArchitecture(); - } else { -#endif - platform = QStringLiteral("linux"); -#ifdef WITH_APPIMAGEUPDATER - } -#endif + platform = QStringLiteral("linux"); } else if (Utility::isBSD()) { platform = QStringLiteral("bsd"); } else if (Utility::isWindows()) { @@ -103,6 +95,13 @@ QUrlQuery Updater::getQueryParams() query.addQueryItem(QStringLiteral("buildArch"), QSysInfo::buildCpuArchitecture()); query.addQueryItem(QStringLiteral("currentArch"), QSysInfo::currentCpuArchitecture()); + // client updater server is now aware of packaging format + // TODO: add packaging string for other supported platforms, too +#ifdef WITH_APPIMAGEUPDATER + query.addQueryItem(QStringLiteral("packaging"), QStringLiteral("AppImage")); +#endif + + query.addQueryItem(QStringLiteral("versionsuffix"), OCC::Version::suffix()); auto channel = ConfigFile().updateChannel(); |