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

Make sure that scripts can also have custom commands. (#3309)

Browse Source 
With the current code it is possible to attach custom commands from
a custom binary, but only for interactive mode. This change makes
it possible to also customize the evaluation context for commands
and scripts.
This commit is contained in:
Michael Nitschinger 2021-04-14 20:21:50 +02:00 committed by GitHub
parent a92ff57270
commit e8bc319f08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-cli/src/cli.rs
View File

@ -1,6 +1,5 @@
use crate::line_editor::configure_ctrl_c; use crate::line_editor::configure_ctrl_c;
use nu_ansi_term::Color; use nu_ansi_term::Color;
use nu_command::commands::default_context::create_default_context;
use nu_engine::{maybe_print_errors, run_block, script::run_script_standalone, EvaluationContext}; use nu_engine::{maybe_print_errors, run_block, script::run_script_standalone, EvaluationContext};
#[allow(unused_imports)] #[allow(unused_imports)]
@ -124,9 +123,7 @@ pub fn search_paths() -> Vec<std::path::PathBuf> {
search_paths search_paths
} }
pub fn run_script_file(options: Options) -> Result<(), Box<dyn Error>> { pub fn run_script_file(context: EvaluationContext, options: Options) -> Result<(), Box<dyn Error>> {
let context = create_default_context(false)?;
if let Some(cfg) = options.config { if let Some(cfg) = options.config {
load_cfg_as_global_cfg(&context, PathBuf::from(cfg)); load_cfg_as_global_cfg(&context, PathBuf::from(cfg));
} else { } else {

6
src/main.rs
View File

@ -150,7 +150,8 @@ fn main() -> Result<(), Box<dyn Error>> {
Some(values) => { Some(values) => {
options.scripts = vec![NuScript::code(values)?]; options.scripts = vec![NuScript::code(values)?];
nu_cli::run_script_file(options)?; let context = create_default_context(false)?;
nu_cli::run_script_file(context, options)?;
return Ok(()); return Ok(());
} }
} }
@ -161,7 +162,8 @@ fn main() -> Result<(), Box<dyn Error>> {
options.scripts = vec![NuScript::source_file(filepath.as_os_str())?]; options.scripts = vec![NuScript::source_file(filepath.as_os_str())?];
nu_cli::run_script_file(options)?; let context = create_default_context(false)?;
nu_cli::run_script_file(context, options)?;
return Ok(()); return Ok(());
} }