diff --git a/cosmic-settings/build.rs b/cosmic-settings/build.rs index 2f8995a..5be3e7c 100644 --- a/cosmic-settings/build.rs +++ b/cosmic-settings/build.rs @@ -2,33 +2,7 @@ use std::path::PathBuf; use std::{env, fs}; use xdgen::{App, Context, FluentString}; -fn get_cosmic_version() -> String { - // Try to get version from git describe - if let Ok(output) = std::process::Command::new("git") - .args(["describe", "--tags", "--always", "--dirty"]) - .output() - { - if output.status.success() { - let version = String::from_utf8_lossy(&output.stdout) - .trim() - .to_string(); - if !version.is_empty() && version != "unknown" { - return format!("COSMIC {}", version); - } - } - } - // Fallback to cargo package version - format!("COSMIC {}", env::var("CARGO_PKG_VERSION").unwrap_or_else(|_| "unknown".to_string())) -} - fn main() { - // Print the version for debugging - let version = get_cosmic_version(); - println!("cargo:warning=COSMIC version: {}", version); - - // Set as a compile-time constant - println!("cargo:rustc-env=COSMIC_VERSION={}", version); - let ctx = Context::new("../i18n", env::var("CARGO_PKG_NAME").unwrap()).unwrap(); [ diff --git a/cosmic-settings/src/pages/system/about.rs b/cosmic-settings/src/pages/system/about.rs index face33e..d169ddb 100644 --- a/cosmic-settings/src/pages/system/about.rs +++ b/cosmic-settings/src/pages/system/about.rs @@ -249,7 +249,6 @@ fn os() -> Section { os = fl!("about-os", "os"); os_arch = fl!("about-os", "os-architecture"); kernel = fl!("about-os", "kernel"); - cosmic_version = fl!("about-os", "cosmic-version"); desktop = fl!("about-os", "desktop-environment"); windowing_system = fl!("about-os", "windowing-system"); }); @@ -273,13 +272,6 @@ fn os() -> Section { settings::flex_item(&*desc[kernel], text::body(&page.info.kernel_version)) .align_items(Alignment::Center), ) - .add( - settings::flex_item( - &*desc[cosmic_version], - text::body(&page.info.cosmic_version), - ) - .align_items(Alignment::Center), - ) .add( settings::flex_item( &*desc[desktop], diff --git a/cosmic-settings/src/pages/system/info.rs b/cosmic-settings/src/pages/system/info.rs index 48527f2..69b3540 100644 --- a/cosmic-settings/src/pages/system/info.rs +++ b/cosmic-settings/src/pages/system/info.rs @@ -10,7 +10,6 @@ use std::process::Command; #[must_use] #[derive(Clone, Debug, Default)] pub struct Info { - pub cosmic_version: String, pub desktop_environment: String, pub device_name: String, pub disk_capacity: String, @@ -145,7 +144,6 @@ impl Info { pub async fn load() -> Info { let mut info = Info { - cosmic_version: env!("COSMIC_VERSION").to_string(), os_architecture: architecture(), kernel_version: kernel_version(), hardware_model: hardware_model(), diff --git a/i18n/en/cosmic_settings.ftl b/i18n/en/cosmic_settings.ftl index 02f9437..f5a614e 100644 --- a/i18n/en/cosmic_settings.ftl +++ b/i18n/en/cosmic_settings.ftl @@ -1012,7 +1012,6 @@ about-os = Operating system .os = Operating system .os-architecture = Operating system architecture .kernel = Kernel version - .cosmic-version = COSMIC version .desktop-environment = Desktop environment .windowing-system = Windowing system