Pass TERM environment var to clear (#6500)

* Pass `TERM` environment var to clear

* don't panic

* use IOErrorSpanned instead of IOError
This commit is contained in:
nibon7 2022-09-07 16:40:44 +08:00 committed by GitHub
parent 2030e25ddc
commit 80624267fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -23,24 +23,31 @@ impl Command for Clear {
fn run( fn run(
&self, &self,
_engine_state: &EngineState, engine_state: &EngineState,
_stack: &mut Stack, stack: &mut Stack,
call: &Call, call: &Call,
_input: PipelineData, _input: PipelineData,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let span = call.head;
if cfg!(windows) { if cfg!(windows) {
CommandSys::new("cmd") CommandSys::new("cmd")
.args(["/C", "cls"]) .args(["/C", "cls"])
.status() .status()
.expect("failed to execute process"); .map_err(|e| ShellError::IOErrorSpanned(e.to_string(), span))?;
} else if cfg!(unix) { } else if cfg!(unix) {
CommandSys::new("/bin/sh") let mut cmd = CommandSys::new("/bin/sh");
.args(["-c", "clear"])
if let Some(Value::String { val, .. }) = stack.get_env_var(engine_state, "TERM") {
cmd.env("TERM", val);
}
cmd.args(["-c", "clear"])
.status() .status()
.expect("failed to execute process"); .map_err(|e| ShellError::IOErrorSpanned(e.to_string(), span))?;
} }
Ok(Value::Nothing { span: call.head }.into_pipeline_data()) Ok(Value::Nothing { span }.into_pipeline_data())
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {