extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multiline script files (#1386)

Browse Source 
* Add support for multiline script files

* clippy
This commit is contained in:
Jonathan Turner
2020-02-13 21:24:18 -08:00
committed by GitHub
parent 473e9f9422
commit 8ae8ebd107
9 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/cli.rs
View File

@ -134,7 +134,7 @@ fn search_paths() -> Vec<std::path::PathBuf> {
search_paths
}
fn load_plugins(context: &mut Context) -> Result<(), ShellError> {
pub fn load_plugins(context: &mut Context) -> Result<(), ShellError> {
let opts = glob::MatchOptions {
case_sensitive: false,
require_literal_separator: false,
@ -376,24 +376,9 @@ pub fn create_default_context(
pub async fn run_pipeline_standalone(
pipeline: String,
redirect_stdin: bool,
context: &mut Context,
) -> Result<(), Box<dyn Error>> {
let mut syncer = crate::env::environment_syncer::EnvironmentSyncer::new();
let mut context = create_default_context(&mut syncer)?;
let _ = load_plugins(&mut context);
let cc = context.ctrl_c.clone();
ctrlc::set_handler(move || {
cc.store(true, Ordering::SeqCst);
})
.expect("Error setting Ctrl-C handler");
if context.ctrl_c.load(Ordering::SeqCst) {
context.ctrl_c.store(false, Ordering::SeqCst);
}
let line = process_line(Ok(pipeline), &mut context, redirect_stdin).await;
let line = process_line(Ok(pipeline), context, redirect_stdin).await;
match line {
LineResult::Success(line) => {
@ -409,7 +394,9 @@ pub async fn run_pipeline_standalone(
};
context.maybe_print_errors(Text::from(line));
std::process::exit(error_code);
if error_code != 0 {
std::process::exit(error_code);
}
}
LineResult::Error(line, err) => {