From 0da9c613625d75507b5df204fabc9a4372f0bff4 Mon Sep 17 00:00:00 2001 From: SadlyNotSappho Date: Tue, 14 Mar 2023 15:19:44 -0700 Subject: [PATCH] add architecture (fuck this) and kernel version detection --- src/lib.rs | 16 +++++++++++++++- src/main.rs | 7 +++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b62b327..1920c02 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,7 @@ use dotenv_parser::parse_dotenv; pub fn get_os() -> String { let os_release = read_to_string("/etc/os-release").unwrap(); let parsed = parse_dotenv(&os_release).unwrap(); - parsed.get("PRETTY_NAME").unwrap().clone() + parsed.get("PRETTY_NAME").unwrap().clone().trim().to_string() } pub fn get_cpu() { @@ -13,3 +13,17 @@ pub fn get_cpu() { println!("{}", &lscpu) } + +pub fn get_arch() -> String { + let binding = std::process::Command::new("uname").arg("-m").output().expect("uname failed"); + let arch = String::from_utf8_lossy(&binding.stdout); + + arch.to_string().trim().to_string() +} + +pub fn get_kernel_ver() -> String { + let binding = std::process::Command::new("uname").arg("-s").output().expect("uname failed"); + let ver = String::from_utf8_lossy(&binding.stdout); + + ver.to_string().trim().to_string() +} diff --git a/src/main.rs b/src/main.rs index 9a3774a..a9bb270 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,8 @@ -use gayfetch::{get_os, get_cpu}; +use gayfetch::*; fn main() { let os = get_os(); - let cpu = get_cpu(); + let arch = get_arch(); + let kernel = get_kernel_ver(); + + println!("OS Name: {os}\nArchitecture: {arch}\nKernel Version: {kernel}"); }