holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update sys with new items, add kernel version to os-info (#5308)

Browse Source 
* update sys with new items, add kernel version to os-info

* clippy
This commit is contained in:
Darren Schroeder
2022-04-23 16:33:27 -05:00
committed by GitHub
parent e6a70f9846
commit e2b510b65e
4 changed files with 113 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/nu-engine/src/eval.rs
View File

@ -1,7 +1,4 @@
use std::cmp::Ordering;
use std::collections::HashMap;
use std::io::Write;
use crate::{current_dir_str, get_full_help};
use nu_path::expand_path_with;
use nu_protocol::ast::{Block, Call, Expr, Expression, Operator};
use nu_protocol::engine::{EngineState, Stack, Visibility};
@ -9,8 +6,10 @@ use nu_protocol::{
IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, Range, ShellError, Span,
Spanned, SyntaxShape, Unit, Value, VarId, ENV_VARIABLE_ID,
};
use crate::{current_dir_str, get_full_help};
use std::cmp::Ordering;
use std::collections::HashMap;
use std::io::Write;
use sysinfo::SystemExt;
pub fn eval_operator(op: &Expression) -> Result<Operator, ShellError> {
match op {
@ -1265,12 +1264,24 @@ pub fn eval_variable(
output_cols.push("pid".into());
output_vals.push(Value::int(pid as i64, span));
let sys = sysinfo::System::new();
let ver = match sys.kernel_version() {
Some(v) => v,
None => "unknown".into(),
};
let os_record = Value::Record {
cols: vec!["name".into(), "arch".into(), "family".into()],
cols: vec![
"name".into(),
"arch".into(),
"family".into(),
"kernel_version".into(),
],
vals: vec![
Value::string(std::env::consts::OS, span),
Value::string(std::env::consts::ARCH, span),
Value::string(std::env::consts::FAMILY, span),
Value::string(ver, span),
],
span,
};