From a9f1b24a88fe79e426153b18b93befaac19f435a Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Sat, 29 Jul 2023 12:04:03 +0200 Subject: [PATCH] Removed Linux DEB package support from ApplicationUpdater --- es-app/src/ApplicationUpdater.cpp | 11 +++-------- es-app/src/ApplicationUpdater.h | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/es-app/src/ApplicationUpdater.cpp b/es-app/src/ApplicationUpdater.cpp index b9a47ad07..5f4572462 100644 --- a/es-app/src/ApplicationUpdater.cpp +++ b/es-app/src/ApplicationUpdater.cpp @@ -52,8 +52,6 @@ ApplicationUpdater::ApplicationUpdater() mPackageType = PackageType::LINUX_STEAM_DECK_APPIMAGE; #elif defined(APPIMAGE_BUILD) mPackageType = PackageType::LINUX_APPIMAGE; -#elif defined(LINUX_DEB_PACKAGE) - mPackageType = PackageType::LINUX_DEB; #endif } @@ -370,8 +368,6 @@ void ApplicationUpdater::compareVersions() mPackage = package; else if (mPackageType == PackageType::MACOS_INTEL && package.name == "macOSIntel") mPackage = package; - else if (mPackageType == PackageType::LINUX_DEB && package.name == "LinuxDEB") - mPackage = package; else if (mPackageType == PackageType::LINUX_APPIMAGE && package.name == "LinuxAppImage") mPackage = package; @@ -408,8 +404,7 @@ void ApplicationUpdater::compareVersions() } if (mPackage.name != "LinuxAppImage" && mPackage.name != "LinuxSteamDeckAppImage") - mResults.append("\nIt can be downloaded from\n").append("https://es-de.org"); - // mResults.append("\nFor more information visit\n").append("https://es-de.org"); + mResults.append("\nFor more information visit\n").append("https://es-de.org"); if (mPackage.message != "") mResults.append("\n").append(mPackage.message); @@ -452,8 +447,8 @@ bool ApplicationUpdater::getResults() } if (mNewVersion && mPackage.name == "") { - LOG(LogWarning) - << "ApplicationUpdater: Couldn't find a package type matching current platform"; + LOG(LogDebug) << "ApplicationUpdater::getResults(): Couldn't find a package type matching " + "current build"; } return mNewVersion; diff --git a/es-app/src/ApplicationUpdater.h b/es-app/src/ApplicationUpdater.h index 8b5f14708..23b1bb48b 100644 --- a/es-app/src/ApplicationUpdater.h +++ b/es-app/src/ApplicationUpdater.h @@ -60,7 +60,6 @@ private: WINDOWS_INSTALLER, MACOS_APPLE, MACOS_INTEL, - LINUX_DEB, LINUX_APPIMAGE, LINUX_STEAM_DECK_APPIMAGE, UNKNOWN