From f75d32be69fcd6ac87644c691d1b1f6cbc5bacb2 Mon Sep 17 00:00:00 2001 From: Krzysztof Andrelczyk Date: Tue, 15 Apr 2025 00:22:07 +0200 Subject: [PATCH] get_current_bundle_type --- plugins/updater/src/updater.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs index a4a0b8bf..2e871e00 100644 --- a/plugins/updater/src/updater.rs +++ b/plugins/updater/src/updater.rs @@ -27,7 +27,11 @@ use reqwest::{ use semver::Version; use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize}; use tauri::{ - utils::platform::current_exe, utils::__TAURI_BUNDLE_TYPE, AppHandle, Resource, Runtime, + utils::{ + config::{get_current_bundle_type, PackageType}, + platform::current_exe, + }, + AppHandle, Resource, Runtime, }; use time::OffsetDateTime; use url::Url; @@ -384,12 +388,12 @@ pub struct Updater { impl Updater { fn get_updater_installer(&self) -> Result> { - match __TAURI_BUNDLE_TYPE { - "DEB_BUNDLE" => Ok(Some(Installer::Deb)), - "RPM_BUNDLE" => Ok(Some(Installer::Rpm)), - "APP_BUNDLE" => Ok(Some(Installer::AppImage)), - "MSI_BUNDLE" => Ok(Some(Installer::Msi)), - "NSS_BUNDLE" => Ok(Some(Installer::Nsis)), + match get_current_bundle_type() { + PackageType::Deb => Ok(Some(Installer::Deb)), + PackageType::Rpm => Ok(Some(Installer::Rpm)), + PackageType::AppImage => Ok(Some(Installer::AppImage)), + PackageType::Msi => Ok(Some(Installer::Msi)), + PackageType::Nsis => Ok(Some(Installer::Nsis)), _ => Err(Error::UnknownInstaller), } }