extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "make module imports in scripts used for relative path. (#5913)" (#6002)

Browse Source 
This reverts commit 6dde231dde.
This commit is contained in:
Jakub Žádník
2022-07-10 15:16:46 +03:00
committed by GitHub
parent 3676a8a48d
commit b7d3623e53
2 changed files with 27 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/config_files.rs
View File

@ -18,7 +18,6 @@ pub(crate) fn read_config_file(
config_file: Option<Spanned<String>>,
is_perf_true: bool,
is_env_config: bool,
interactive: bool,
) {
// Load config startup file
if let Some(file) = config_file {
@ -47,13 +46,7 @@ pub(crate) fn read_config_file(
config_path.push(if is_env_config { ENV_FILE } else { CONFIG_FILE });
let config_file = if is_env_config {
include_str!("../docs/sample_config/default_env.nu")
} else {
include_str!("../docs/sample_config/default_config.nu")
};
if !config_path.exists() && interactive {
if !config_path.exists() {
let file_msg = if is_env_config {
"environment config"
} else {
@ -71,6 +64,12 @@ pub(crate) fn read_config_file(
.read_line(&mut answer)
.expect("Failed to read user input");
let config_file = if is_env_config {
include_str!("../docs/sample_config/default_env.nu")
} else {
include_str!("../docs/sample_config/default_config.nu")
};
match answer.to_lowercase().trim() {
"y" | "" => {
let mut output = File::create(&config_path).expect("Unable to create file");
@ -94,19 +93,6 @@ pub(crate) fn read_config_file(
return;
}
}
} else {
// Just use the contents of "default_config.nu" or "default_env.nu"
eval_source(
engine_state,
stack,
config_file.as_bytes(),
if is_env_config {
"default_env.nu"
} else {
"default_config.nu"
},
PipelineData::new(Span::new(0, 0)),
);
}
eval_config_contents(config_path, engine_state, stack);