Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up the handling of name in run_external, now that we don't need to know about the expr

Browse Source
This commit is contained in:
Devyn Cairns 2024-06-06 18:31:35 -07:00
parent 9cc30bb602
commit 7f17a13b0e
No known key found for this signature in database
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-command/src/system/run_external.rs
View File

@ -53,26 +53,15 @@ impl Command for External {
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let cwd = engine_state.cwd(Some(stack))?; let cwd = engine_state.cwd(Some(stack))?;
// Evaluate the command name in the same way the arguments are evaluated. Since this isn't let name: Value = call.req(engine_state, stack, 0)?;
// a spread, it should return a one-element vec.
let name_expr = call
.positional_nth(0)
.ok_or_else(|| ShellError::MissingParameter {
param_name: "command".into(),
span: call.head,
})?;
let name = eval_argument(engine_state, stack, name_expr, false)?
.pop()
.expect("eval_argument returned zero-element vec")
.into_spanned(name_expr.span);
let name_str: Cow<str> = match &name.item { let name_str: Cow<str> = match &name {
Value::Glob { val, .. } => Cow::Borrowed(val), Value::Glob { val, .. } => Cow::Borrowed(val),
Value::String { val, .. } => Cow::Borrowed(val), Value::String { val, .. } => Cow::Borrowed(val),
_ => Cow::Owned(name.item.clone().coerce_into_string()?), _ => Cow::Owned(name.clone().coerce_into_string()?),
}; };
let expanded_name = match &name.item { let expanded_name = match &name {
// Expand tilde and ndots on the name if it's a bare string / glob (#13000) // Expand tilde and ndots on the name if it's a bare string / glob (#13000)
Value::Glob { no_expand, .. } if !*no_expand => expand_ndots(expand_tilde(&*name_str)), Value::Glob { no_expand, .. } if !*no_expand => expand_ndots(expand_tilde(&*name_str)),
_ => Path::new(&*name_str).to_owned(), _ => Path::new(&*name_str).to_owned(),