From dafbd58ddabe8fadd9801c8545f300a0189302e3 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Sat, 31 Aug 2024 06:01:43 +0300 Subject: [PATCH] minor fix --- src/content/mod.rs | 29 +---------------------------- src/kernel_pkg/mod.rs | 4 ++-- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/content/mod.rs b/src/content/mod.rs index b5d8168..bc3cacf 100644 --- a/src/content/mod.rs +++ b/src/content/mod.rs @@ -359,20 +359,7 @@ fn create_kernel_badges( let json: serde_json::Value = serde_json::from_str(&kernel_db).expect("Unable to parse"); - let kernel_version_deter = match json["latest_kernel_version_deter_pkg"].as_str() { - Some(t) => t, - _ => "kernel", - }; - - let kernel_version = match Command::new( - "/usr/lib/pika/kernel-manager/scripts/generate_package_info.sh", - ) - .args(["version", &kernel_version_deter]) - .output() - { - Ok(t) => String::from_utf8(t.stdout).unwrap().trim().to_owned(), - _ => "0.0.0".to_owned(), - }; + let kernel_version = json["latest_kernel_version"].as_str().to_owned().unwrap().to_string() let version_css_style = if &running_kernel_info.version == &kernel_version { "background-green-bg" @@ -418,20 +405,6 @@ fn create_kernel_badges( )); } -fn save_branch_config(branch: &str) { - let config_path = get_my_home() - .unwrap() - .unwrap() - .join(".config/pika-kernel-manager"); - match &config_path.exists() { - true => fs::write(config_path.join("branch"), branch).unwrap(), - _ => { - fs::create_dir(&config_path).unwrap(); - fs::write(config_path.join("branch"), branch).unwrap(); - } - } -} - fn create_current_sched_badge( badge_box: &adw::Bin, running_kernel_info: &RunningKernelInfo, diff --git a/src/kernel_pkg/mod.rs b/src/kernel_pkg/mod.rs index 13f5c83..2e64e2e 100644 --- a/src/kernel_pkg/mod.rs +++ b/src/kernel_pkg/mod.rs @@ -237,8 +237,8 @@ fn add_package_rows( let kernel_main_package_clone0 = kernel_main_package.clone(); std::thread::spawn(move || loop { - let command_installed_status = Command::new("rpm") - .args(["-q", &kernel_main_package_clone0]) + let command_installed_status = Command::new("dpkg") + .args(["-s", &kernel_main_package_clone0]) .output() .unwrap(); if command_installed_status.status.success() {