This PR is a complete rewrite of `run_external.rs`. The main goal of the rewrite is improving readability, but it also fixes some bugs related to argument handling and the PATH variable (fixes https://github.com/nushell/nushell/issues/6011). I'll discuss some technical details to make reviewing easier. ## Argument handling Quoting arguments for external commands is hard. Like, *really* hard. We've had more than a dozen issues and PRs dedicated to quoting arguments (see Appendix) but the current implementation is still buggy. Here's a demonstration of the buggy behavior: ```nu let foo = "'bar'" ^touch $foo # This creates a file named `bar`, but it should be `'bar'` ^touch ...[ "'bar'" ] # Same ``` I'll describe how this PR deals with argument handling. First, we'll introduce the concept of **bare strings**. Bare strings are **string literals** that are either **unquoted** or **quoted by backticks** [^1]. Strings within a list literal are NOT considered bare strings, even if they are unquoted or quoted by backticks. When a bare string is used as an argument to external process, we need to perform tilde-expansion, glob-expansion, and inner-quotes-removal, in that order. "Inner-quotes-removal" means transforming from `--option="value"` into `--option=value`. ## `.bat` files and CMD built-ins On Windows, `.bat` files and `.cmd` files are considered executable, but they need `CMD.exe` as the interpreter. The Rust standard library supports running `.bat` files directly and will spawn `CMD.exe` under the hood (see [documentation](https://doc.rust-lang.org/std/process/index.html#windows-argument-splitting)). However, other extensions are not supported [^2]. Nushell also supports a selected number of CMD built-ins. The problem with CMD is that it uses a different set of quoting rules. Correctly quoting for CMD requires using [Command::raw_arg()](https://doc.rust-lang.org/std/os/windows/process/trait.CommandExt.html#tymethod.raw_arg) and manually quoting CMD special characters, on top of quoting from the Nushell side. ~~I decided that this is too complex and chose to reject special characters in CMD built-ins instead [^3]. Hopefully this will not affact real-world use cases.~~ I've implemented escaping that works reasonably well. ## `which-support` feature The `which` crate is now a hard dependency of `nu-command`, making the `which-support` feature essentially useless. The `which` crate is already a hard dependency of `nu-cli`, and we should consider removing the `which-support` feature entirely. ## Appendix Here's a list of quoting-related issues and PRs in rough chronological order. * https://github.com/nushell/nushell/issues/4609 * https://github.com/nushell/nushell/issues/4631 * https://github.com/nushell/nushell/issues/4601 * https://github.com/nushell/nushell/pull/5846 * https://github.com/nushell/nushell/issues/5978 * https://github.com/nushell/nushell/pull/6014 * https://github.com/nushell/nushell/issues/6154 * https://github.com/nushell/nushell/pull/6161 * https://github.com/nushell/nushell/issues/6399 * https://github.com/nushell/nushell/pull/6420 * https://github.com/nushell/nushell/pull/6426 * https://github.com/nushell/nushell/issues/6465 * https://github.com/nushell/nushell/issues/6559 * https://github.com/nushell/nushell/pull/6560 [^1]: The idea that backtick-quoted strings act like bare strings was introduced by Kubouch and briefly mentioned in [the language reference](https://www.nushell.sh/lang-guide/chapters/strings_and_text.html#backtick-quotes). [^2]: The documentation also said "running .bat scripts in this way may be removed in the future and so should not be relied upon", which is another reason to move away from this. But again, quoting for CMD is hard. [^3]: If anyone wants to try, the best resource I found on the topic is [this](https://daviddeley.com/autohotkey/parameters/parameters.htm).
115 lines
3.8 KiB
Rust
115 lines
3.8 KiB
Rust
use nu_cmd_base::util::get_editor;
|
|
use nu_engine::{command_prelude::*, env_to_strings};
|
|
use nu_protocol::{process::ChildProcess, ByteStream};
|
|
use nu_system::ForegroundChild;
|
|
|
|
#[derive(Clone)]
|
|
pub struct ConfigEnv;
|
|
|
|
impl Command for ConfigEnv {
|
|
fn name(&self) -> &str {
|
|
"config env"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.category(Category::Env)
|
|
.input_output_types(vec![(Type::Nothing, Type::Any)])
|
|
.switch("default", "Print default `env.nu` file instead.", Some('d'))
|
|
// TODO: Signature narrower than what run actually supports theoretically
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Edit nu environment configurations."
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "allow user to open and update nu env",
|
|
example: "config env",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "allow user to print default `env.nu` file",
|
|
example: "config env --default,",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "allow saving the default `env.nu` locally",
|
|
example: "config env --default | save -f ~/.config/nushell/default_env.nu",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
// `--default` flag handling
|
|
if call.has_flag(engine_state, stack, "default")? {
|
|
let head = call.head;
|
|
return Ok(Value::string(nu_utils::get_default_env(), head).into_pipeline_data());
|
|
}
|
|
|
|
// Find the editor executable.
|
|
let (editor_name, editor_args) = get_editor(engine_state, stack, call.head)?;
|
|
let paths = nu_engine::env::path_str(engine_state, stack, call.head)?;
|
|
let cwd = engine_state.cwd(Some(stack))?;
|
|
let editor_executable =
|
|
crate::which(&editor_name, &paths, &cwd).ok_or(ShellError::ExternalCommand {
|
|
label: format!("`{editor_name}` not found"),
|
|
help: "Failed to find the editor executable".into(),
|
|
span: call.head,
|
|
})?;
|
|
|
|
let Some(env_path) = engine_state.get_config_path("env-path") else {
|
|
return Err(ShellError::GenericError {
|
|
error: "Could not find $nu.env-path".into(),
|
|
msg: "Could not find $nu.env-path".into(),
|
|
span: None,
|
|
help: None,
|
|
inner: vec![],
|
|
});
|
|
};
|
|
let env_path = env_path.to_string_lossy().to_string();
|
|
|
|
// Create the command.
|
|
let mut command = std::process::Command::new(editor_executable);
|
|
|
|
// Configure PWD.
|
|
command.current_dir(cwd);
|
|
|
|
// Configure environment variables.
|
|
let envs = env_to_strings(engine_state, stack)?;
|
|
command.env_clear();
|
|
command.envs(envs);
|
|
|
|
// Configure args.
|
|
command.arg(env_path);
|
|
command.args(editor_args);
|
|
|
|
// Spawn the child process. On Unix, also put the child process to
|
|
// foreground if we're in an interactive session.
|
|
#[cfg(windows)]
|
|
let child = ForegroundChild::spawn(command)?;
|
|
#[cfg(unix)]
|
|
let child = ForegroundChild::spawn(
|
|
command,
|
|
engine_state.is_interactive,
|
|
&engine_state.pipeline_externals_state,
|
|
)?;
|
|
|
|
// Wrap the output into a `PipelineData::ByteStream`.
|
|
let child = ChildProcess::new(child, None, false, call.head)?;
|
|
Ok(PipelineData::ByteStream(
|
|
ByteStream::child(child, call.head),
|
|
None,
|
|
))
|
|
}
|
|
}
|