2022-10-07 18:54:36 +00:00
|
|
|
use super::run_external::ExternalCommand;
|
|
|
|
use nu_engine::{current_dir, env_to_strings, CallExt};
|
2022-01-25 17:27:35 +00:00
|
|
|
use nu_protocol::{
|
2022-10-07 18:54:36 +00:00
|
|
|
ast::{Call, Expr},
|
2022-01-25 17:27:35 +00:00
|
|
|
engine::{Command, EngineState, Stack},
|
2022-10-07 18:54:36 +00:00
|
|
|
Category, Example, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
|
2022-01-25 17:27:35 +00:00
|
|
|
};
|
2022-10-07 18:54:36 +00:00
|
|
|
use std::os::unix::process::CommandExt;
|
2022-01-25 17:27:35 +00:00
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct Exec;
|
|
|
|
|
|
|
|
impl Command for Exec {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"exec"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("exec")
|
|
|
|
.required("command", SyntaxShape::String, "the command to execute")
|
|
|
|
.rest(
|
|
|
|
"rest",
|
|
|
|
SyntaxShape::String,
|
|
|
|
"any additional arguments for the command",
|
|
|
|
)
|
|
|
|
.category(Category::System)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Execute a command, replacing the current process."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
|
|
"Currently supported only on Unix-based systems."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &mut Stack,
|
|
|
|
call: &Call,
|
|
|
|
_input: PipelineData,
|
|
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
|
|
exec(engine_state, stack, call)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![
|
|
|
|
Example {
|
|
|
|
description: "Execute external 'ps aux' tool",
|
|
|
|
example: "exec ps aux",
|
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Execute 'nautilus'",
|
|
|
|
example: "exec nautilus",
|
|
|
|
result: None,
|
|
|
|
},
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn exec(
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &mut Stack,
|
|
|
|
call: &Call,
|
|
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
|
|
let name: Spanned<String> = call.req(engine_state, stack, 0)?;
|
|
|
|
let name_span = name.span;
|
|
|
|
|
|
|
|
let args: Vec<Spanned<String>> = call.rest(engine_state, stack, 1)?;
|
2022-08-27 13:22:02 +00:00
|
|
|
let args_expr: Vec<nu_protocol::ast::Expression> =
|
|
|
|
call.positional_iter().skip(1).cloned().collect();
|
|
|
|
let mut arg_keep_raw = vec![];
|
|
|
|
for one_arg_expr in args_expr {
|
|
|
|
match one_arg_expr.expr {
|
|
|
|
// refer to `parse_dollar_expr` function
|
|
|
|
// the expression type of $variable_name, $"($variable_name)"
|
|
|
|
// will be Expr::StringInterpolation, Expr::FullCellPath
|
|
|
|
Expr::StringInterpolation(_) | Expr::FullCellPath(_) => arg_keep_raw.push(true),
|
|
|
|
_ => arg_keep_raw.push(false),
|
|
|
|
}
|
|
|
|
}
|
2022-01-25 17:27:35 +00:00
|
|
|
|
|
|
|
let cwd = current_dir(engine_state, stack)?;
|
2022-03-11 22:18:39 +00:00
|
|
|
let env_vars = env_to_strings(engine_state, stack)?;
|
2022-01-25 17:27:35 +00:00
|
|
|
let current_dir = current_dir(engine_state, stack)?;
|
|
|
|
|
|
|
|
let external_command = ExternalCommand {
|
|
|
|
name,
|
|
|
|
args,
|
2022-08-27 13:22:02 +00:00
|
|
|
arg_keep_raw,
|
2022-01-25 17:27:35 +00:00
|
|
|
env_vars,
|
2022-02-21 22:22:21 +00:00
|
|
|
redirect_stdout: true,
|
|
|
|
redirect_stderr: false,
|
Make external command substitution works friendly(like fish shell, trailing ending newlines) (#7156)
# Description
As title, when execute external sub command, auto-trimming end
new-lines, like how fish shell does.
And if the command is executed directly like: `cat tmp`, the result
won't change.
Fixes: #6816
Fixes: #3980
Note that although nushell works correctly by directly replace output of
external command to variable(or other places like string interpolation),
it's not friendly to user, and users almost want to use `str trim` to
trim trailing newline, I think that's why fish shell do this
automatically.
If the pr is ok, as a result, no more `str trim -r` is required when
user is writing scripts which using external commands.
# User-Facing Changes
Before:
<img width="523" alt="img"
src="https://user-images.githubusercontent.com/22256154/202468810-86b04dbb-c147-459a-96a5-e0095eeaab3d.png">
After:
<img width="505" alt="img"
src="https://user-images.githubusercontent.com/22256154/202468599-7b537488-3d6b-458e-9d75-d85780826db0.png">
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace --features=extra -- -D warnings -D
clippy::unwrap_used -A clippy::needless_collect` to check that you're
using the standard code style
- `cargo test --workspace --features=extra` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-11-23 03:51:57 +00:00
|
|
|
trim_end_newline: false,
|
2022-01-25 17:27:35 +00:00
|
|
|
};
|
|
|
|
|
2022-06-04 06:47:36 +00:00
|
|
|
let mut command = external_command.spawn_simple_command(&cwd.to_string_lossy())?;
|
2022-01-25 17:27:35 +00:00
|
|
|
command.current_dir(current_dir);
|
|
|
|
|
|
|
|
let err = command.exec(); // this replaces our process, should not return
|
|
|
|
|
2022-04-18 12:34:10 +00:00
|
|
|
Err(ShellError::GenericError(
|
2022-01-25 17:27:35 +00:00
|
|
|
"Error on exec".to_string(),
|
|
|
|
err.to_string(),
|
2022-04-18 12:34:10 +00:00
|
|
|
Some(name_span),
|
|
|
|
None,
|
|
|
|
Vec::new(),
|
2022-01-25 17:27:35 +00:00
|
|
|
))
|
|
|
|
}
|