Skip to content

Commit

Permalink
Add kernel name option
Browse files Browse the repository at this point in the history
  • Loading branch information
valpackett committed Feb 13, 2022
1 parent 8367221 commit a7df3cb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
8 changes: 6 additions & 2 deletions src/fields.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,15 @@ pub fn get_distro_name() -> Result<String, String> {
Err("error".to_string())
}

pub fn get_kernel() -> Result<String, String> {
pub fn get_kernel(show_kern_name: bool) -> Result<String, String> {
let uname = nix::sys::utsname::uname();
Ok(format_data(
"kernel",
&format!("{} {}", uname.release(), uname.machine())))
&if show_kern_name {
format!("{}/{} {}", uname.sysname(), uname.machine(), uname.release())
} else {
format!("{} {}", uname.release(), uname.machine())
}))
}

pub fn get_shell() -> Result<String, String> {
Expand Down
7 changes: 6 additions & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ mod fields;
fn main() {

let args: Vec<String> = env::args().collect();
let mut show_kern_name = false;
let mut is_christmas = false;
let mut ascii_tree: String;

Expand Down Expand Up @@ -84,6 +85,10 @@ fn main() {
break;
}

"--kernel-name" | "-k" => {
show_kern_name = true;
}

_ => {
invalid_option(arg.to_string());
}
Expand All @@ -108,7 +113,7 @@ fn main() {

// Kernel name

if let Ok(value) = fields::get_kernel() {
if let Ok(value) = fields::get_kernel(show_kern_name) {
data_list.push(value);
};

Expand Down

0 comments on commit a7df3cb

Please sign in to comment.