mirror of
https://github.com/nushell/nushell.git
synced 2025-04-02 12:19:48 +02:00
# Description This PR makes it so that non-zero exit codes and termination by signal are treated as a normal `ShellError`. Currently, these are silent errors. That is, if an external command fails, then it's code block is aborted, but the parent block can sometimes continue execution. E.g., see #8569 and this example: ```nushell [1 2] | each { ^false } ``` Before this would give: ``` ╭───┬──╮ │ 0 │ │ │ 1 │ │ ╰───┴──╯ ``` Now, this shows an error: ``` Error: nu:🐚:eval_block_with_input × Eval block failed with pipeline input ╭─[entry #1:1:2] 1 │ [1 2] | each { ^false } · ┬ · ╰── source value ╰──── Error: nu:🐚:non_zero_exit_code × External command had a non-zero exit code ╭─[entry #1:1:17] 1 │ [1 2] | each { ^false } · ──┬── · ╰── exited with code 1 ╰──── ``` This PR fixes #12874, fixes #5960, fixes #10856, and fixes #5347. This PR also partially addresses #10633 and #10624 (only the last command of a pipeline is currently checked). It looks like #8569 is already fixed, but this PR will make sure it is definitely fixed (fixes #8569). # User-Facing Changes - Non-zero exit codes and termination by signal now cause an error to be thrown. - The error record value passed to a `catch` block may now have an `exit_code` column containing the integer exit code if the error was due to an external command. - Adds new config values, `display_errors.exit_code` and `display_errors.termination_signal`, which determine whether an error message should be printed in the respective error cases. For non-interactive sessions, these are set to `true`, and for interactive sessions `display_errors.exit_code` is false (via the default config). # Tests Added a few tests. # After Submitting - Update docs and book. - Future work: - Error if other external commands besides the last in a pipeline exit with a non-zero exit code. Then, deprecate `do -c` since this will be the default behavior everywhere. - Add a better mechanism for exit codes and deprecate `$env.LAST_EXIT_CODE` (it's buggy).
135 lines
4.3 KiB
Rust
135 lines
4.3 KiB
Rust
use super::base64::{operate, ActionType, Base64CommandArguments, CHARACTER_SET_DESC};
|
|
use nu_engine::command_prelude::*;
|
|
use nu_protocol::report_shell_warning;
|
|
|
|
#[derive(Clone)]
|
|
pub struct EncodeBase64Old;
|
|
|
|
impl Command for EncodeBase64Old {
|
|
fn name(&self) -> &str {
|
|
"encode base64"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("encode base64")
|
|
.input_output_types(vec![
|
|
(Type::String, Type::String),
|
|
(Type::Binary, Type::String),
|
|
(
|
|
Type::List(Box::new(Type::String)),
|
|
Type::List(Box::new(Type::String)),
|
|
),
|
|
(
|
|
Type::List(Box::new(Type::Binary)),
|
|
Type::List(Box::new(Type::String)),
|
|
),
|
|
// Relaxed for heterogeneous list.
|
|
// Should be removed as soon as the type system supports better restrictions
|
|
(
|
|
Type::List(Box::new(Type::Any)),
|
|
Type::List(Box::new(Type::String)),
|
|
),
|
|
(Type::table(), Type::table()),
|
|
(Type::record(), Type::record()),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.named(
|
|
"character-set",
|
|
SyntaxShape::String,
|
|
CHARACTER_SET_DESC,
|
|
Some('c'),
|
|
)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"For a data structure input, encode data at the given cell paths.",
|
|
)
|
|
.category(Category::Hash)
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"Encode a string or binary value using Base64."
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Encode binary data",
|
|
example: "0x[09 F9 11 02 9D 74 E3 5B D8 41 56 C5 63 56 88 C0] | encode base64",
|
|
result: Some(Value::test_string("CfkRAp1041vYQVbFY1aIwA==")),
|
|
},
|
|
Example {
|
|
description: "Encode a string with default settings",
|
|
example: "'Some Data' | encode base64",
|
|
result: Some(Value::test_string("U29tZSBEYXRh")),
|
|
},
|
|
Example {
|
|
description: "Encode a string with the binhex character set",
|
|
example: "'Some Data' | encode base64 --character-set binhex",
|
|
result: Some(Value::test_string(r#"8fpYC5"%BA4K"#)),
|
|
},
|
|
]
|
|
}
|
|
|
|
fn is_const(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
report_shell_warning(
|
|
engine_state,
|
|
&ShellError::Deprecated {
|
|
old_command: "encode base64".into(),
|
|
new_suggestion: "the new `encode new-base64` version".into(),
|
|
span: call.head,
|
|
url: "`help encode new-base64`".into(),
|
|
},
|
|
);
|
|
|
|
let character_set: Option<Spanned<String>> =
|
|
call.get_flag(engine_state, stack, "character-set")?;
|
|
let binary = call.has_flag(engine_state, stack, "binary")?;
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let args = Base64CommandArguments {
|
|
action_type: ActionType::Encode,
|
|
binary,
|
|
character_set,
|
|
};
|
|
operate(engine_state, call, input, cell_paths, args)
|
|
}
|
|
|
|
fn run_const(
|
|
&self,
|
|
working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let character_set: Option<Spanned<String>> =
|
|
call.get_flag_const(working_set, "character-set")?;
|
|
let binary = call.has_flag_const(working_set, "binary")?;
|
|
let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
|
|
let args = Base64CommandArguments {
|
|
action_type: ActionType::Encode,
|
|
binary,
|
|
character_set,
|
|
};
|
|
operate(working_set.permanent(), call, input, cell_paths, args)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
crate::test_examples(EncodeBase64Old)
|
|
}
|
|
}
|