Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Interpret lists as series of args for externals (#550)

Browse source 
* Interpret lists as series of args for externals

* Fix clippy warnings
This commit is contained in:
Jakub Žádník 2021-12-22 10:13:05 +02:00 committed by GitHub
parent ea6912c3f7
commit 8ba3e3570c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/nu-command/src/system/run_external.rs
View file

@ -50,7 +50,7 @@ impl Command for External {
input: PipelineData,
) -> Result<PipelineData, ShellError> {
let mut name: Spanned<String> = call.req(engine_state, stack, 0)?;
let args: Vec<String> = call.rest(engine_state, stack, 1)?;
let args: Vec<Value> = call.rest(engine_state, stack, 1)?;
let last_expression = call.has_flag("last_expression");
// Translate environment variables from Values to Strings
@ -85,9 +85,34 @@ impl Command for External {
return Ok(PipelineData::new(call.head));
}
let mut args_strs = vec![];
for arg in args {
if let Ok(s) = arg.as_string() {
args_strs.push(s);
} else if let Value::List { vals, .. } = arg {
// Interpret a list as a series of arguments
for val in vals {
if let Ok(s) = val.as_string() {
args_strs.push(s);
} else {
return Err(ShellError::ExternalCommand(
"Cannot convert argument to a string".into(),
val.span()?,
));
}
}
} else {
return Err(ShellError::ExternalCommand(
"Cannot convert argument to a string".into(),
arg.span()?,
));
}
}
let command = ExternalCommand {
name,
args,
args: args_strs,
last_expression,
env_vars: env_vars_str,
call,

8
crates/nu-engine/src/eval.rs
View file

@ -470,12 +470,12 @@ pub fn eval_variable(
let mut output_vals = vec![];
let env_vars = stack.get_env_vars();
let env_columns: Vec<String> = env_vars.keys().map(|x| x.to_string()).collect();
let env_values: Vec<Value> = env_vars.values().cloned().collect();
let env_columns = env_vars.keys();
let env_values = env_vars.values();
let mut pairs = env_columns
.into_iter()
.zip(env_values.into_iter())
.map(|x| x.to_string())
.zip(env_values.cloned())
.collect::<Vec<(String, Value)>>();
pairs.sort_by(|a, b| a.0.cmp(&b.0));