mirror of
https://github.com/nushell/nushell.git
synced 2024-12-25 16:39:08 +01:00
Lets internals also have exit codes (#4664)
This commit is contained in:
parent
995757c055
commit
446c2aab17
26
src/utils.rs
26
src/utils.rs
@ -4,7 +4,7 @@ use nu_engine::eval_block;
|
|||||||
use nu_parser::{lex, parse, trim_quotes, Token, TokenContents};
|
use nu_parser::{lex, parse, trim_quotes, Token, TokenContents};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
engine::{EngineState, Stack, StateWorkingSet},
|
engine::{EngineState, Stack, StateWorkingSet},
|
||||||
PipelineData, ShellError, Value,
|
PipelineData, ShellError, Span, Value,
|
||||||
};
|
};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
@ -231,7 +231,23 @@ pub(crate) fn eval_source(
|
|||||||
if let PipelineData::ExternalStream { exit_code, .. } = &mut pipeline_data {
|
if let PipelineData::ExternalStream { exit_code, .. } = &mut pipeline_data {
|
||||||
if let Some(exit_code) = exit_code.take().and_then(|it| it.last()) {
|
if let Some(exit_code) = exit_code.take().and_then(|it| it.last()) {
|
||||||
stack.add_env_var("LAST_EXIT_CODE".to_string(), exit_code);
|
stack.add_env_var("LAST_EXIT_CODE".to_string(), exit_code);
|
||||||
|
} else {
|
||||||
|
stack.add_env_var(
|
||||||
|
"LAST_EXIT_CODE".to_string(),
|
||||||
|
Value::Int {
|
||||||
|
val: 0,
|
||||||
|
span: Span { start: 0, end: 0 },
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
stack.add_env_var(
|
||||||
|
"LAST_EXIT_CODE".to_string(),
|
||||||
|
Value::Int {
|
||||||
|
val: 0,
|
||||||
|
span: Span { start: 0, end: 0 },
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Err(err) = print_pipeline_data(pipeline_data, engine_state, stack) {
|
if let Err(err) = print_pipeline_data(pipeline_data, engine_state, stack) {
|
||||||
@ -249,6 +265,14 @@ pub(crate) fn eval_source(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
stack.add_env_var(
|
||||||
|
"LAST_EXIT_CODE".to_string(),
|
||||||
|
Value::Int {
|
||||||
|
val: 1,
|
||||||
|
span: Span { start: 0, end: 0 },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
|
||||||
report_error(&working_set, &err);
|
report_error(&working_set, &err);
|
||||||
|
Loading…
Reference in New Issue
Block a user