From ccebdd7a7ff7a4554cfe6a0edc560445c13345c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C5=BD=C3=A1dn=C3=ADk?= Date: Sat, 13 Aug 2022 01:13:28 +0300 Subject: [PATCH] Fix environment merging in hooks (#6309) --- crates/nu-cli/src/repl.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs index 67e42b2bef..73b55d8948 100644 --- a/crates/nu-cli/src/repl.rs +++ b/crates/nu-cli/src/repl.rs @@ -786,9 +786,6 @@ pub fn eval_hook( for var_id in var_ids.iter() { stack.vars.remove(var_id); } - - let cwd = get_guaranteed_cwd(engine_state, stack); - engine_state.merge_env(stack, cwd)?; } Value::Block { val: block_id, @@ -796,8 +793,6 @@ pub fn eval_hook( .. } => { run_hook_block(engine_state, stack, block_id, arguments, block_span)?; - let cwd = get_guaranteed_cwd(engine_state, stack); - engine_state.merge_env(stack, cwd)?; } other => { return Err(ShellError::UnsupportedConfigValue( @@ -825,6 +820,9 @@ pub fn eval_hook( } } + let cwd = get_guaranteed_cwd(engine_state, stack); + engine_state.merge_env(stack, cwd)?; + Ok(()) }