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

Add $env.CURRENT_FILE variable (#8861)

Browse Source 
Co-authored-by: Jelle Besseling <jelle@bigbridge.nl>
This commit is contained in:
Jelle Besseling
2023-04-13 22:33:29 +02:00
committed by GitHub
parent b2d7427d2d
commit 8ddebcb932
7 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-command/src/env/let_env.rs vendored
View File

@ -51,7 +51,7 @@ impl Command for LetEnv {
.0
.into_value(call.head);
if env_var.item == "FILE_PWD" || env_var.item == "PWD" {
if env_var.item == "FILE_PWD" || env_var.item == "CURRENT_FILE" || env_var.item == "PWD" {
return Err(ShellError::AutomaticEnvVarSetManually {
envvar_name: env_var.item,
span: env_var.span,

16
crates/nu-command/src/env/load_env.rs vendored
View File

@ -42,28 +42,22 @@ impl Command for LoadEnv {
match arg {
Some((cols, vals)) => {
for (env_var, rhs) in cols.into_iter().zip(vals) {
if env_var == "FILE_PWD" {
let env_var_ = env_var.as_str();
if ["FILE_PWD", "CURRENT_FILE", "PWD"].contains(&env_var_) {
return Err(ShellError::AutomaticEnvVarSetManually {
envvar_name: env_var,
span: call.head,
});
}
if env_var == "PWD" {
return Err(ShellError::AutomaticEnvVarSetManually {
envvar_name: env_var,
span: call.head,
});
} else {
stack.add_env_var(env_var, rhs);
}
stack.add_env_var(env_var, rhs);
}
Ok(PipelineData::empty())
}
None => match input {
PipelineData::Value(Value::Record { cols, vals, .. }, ..) => {
for (env_var, rhs) in cols.into_iter().zip(vals) {
if env_var == "FILE_PWD" {
let env_var_ = env_var.as_str();
if ["FILE_PWD", "CURRENT_FILE"].contains(&env_var_) {
return Err(ShellError::AutomaticEnvVarSetManually {
envvar_name: env_var,
span: call.head,

15
crates/nu-command/src/env/source_env.rs vendored
View File

@ -47,7 +47,7 @@ impl Command for SourceEnv {
let block_id: i64 = call.req_parser_info(engine_state, caller_stack, "block_id")?;
// Set the currently evaluated directory (file-relative PWD)
let mut parent = if let Some(path) = find_in_dirs_env(
let file_path = if let Some(path) = find_in_dirs_env(
&source_filename.item,
engine_state,
caller_stack,
@ -57,11 +57,17 @@ impl Command for SourceEnv {
} else {
return Err(ShellError::FileNotFound(source_filename.span));
};
parent.pop();
let file_pwd = Value::string(parent.to_string_lossy(), call.head);
if let Some(parent) = file_path.parent() {
let file_pwd = Value::string(parent.to_string_lossy(), call.head);
caller_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
caller_stack.add_env_var("FILE_PWD".to_string(), file_pwd);
}
caller_stack.add_env_var(
"CURRENT_FILE".to_string(),
Value::string(file_path.to_string_lossy(), call.head),
);
// Evaluate the block
let block = engine_state.get_block(block_id as usize).clone();
@ -81,6 +87,7 @@ impl Command for SourceEnv {
// Remove the file-relative PWD
caller_stack.remove_env_var(engine_state, "FILE_PWD");
caller_stack.remove_env_var(engine_state, "CURRENT_FILE");
result
}