holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't panic if nu failed to create config files (#6104)

Browse Source 
* Don't panic if nu failed to create config files

Signed-off-by: nibon7 <nibon7@163.com>

* eval default config

Signed-off-by: nibon7 <nibon7@163.com>

* tweak words

Signed-off-by: nibon7 <nibon7@163.com>

* tweak words again

Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-07-24 20:00:52 +08:00 committed by GitHub
parent 5706eddee3
commit 0812a08bfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/config_files.rs
View File

@ -71,40 +71,31 @@ pub(crate) fn read_config_file(
}; };
match answer.to_lowercase().trim() { match answer.to_lowercase().trim() {
"y" | "" => { "y" | "" => match File::create(&config_path) {
let mut output = File::create(&config_path).expect("Unable to create file"); Ok(mut output) => match write!(output, "{}", config_file) {
write!(output, "{}", config_file).expect("Unable to write to config file"); Ok(_) => {
println!("Config file created at: {}", config_path.to_string_lossy()); println!("Config file created at: {}", config_path.to_string_lossy())
} }
_ => { Err(_) => {
println!("Continuing without config file"); eprintln!(
// Just use the contents of "default_config.nu" or "default_env.nu" "Unable to write to {}, sourcing default file instead",
eval_source( config_path.to_string_lossy(),
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_default_config(engine_state, stack, config_file, is_env_config);
// Merge the environment in case env vars changed in the config return;
match nu_engine::env::current_dir(engine_state, stack) {
Ok(cwd) => {
if let Err(e) = engine_state.merge_env(stack, cwd) {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &e);
} }
},
Err(_) => {
eprintln!(
"Unable to create {}, sourcing default file instead",
config_file
);
eval_default_config(engine_state, stack, config_file, is_env_config);
return;
} }
Err(e) => { },
let working_set = StateWorkingSet::new(engine_state); _ => {
report_error(&working_set, &e); eval_default_config(engine_state, stack, config_file, is_env_config);
}
}
return; return;
} }
} }
@ -169,3 +160,38 @@ pub(crate) fn read_default_env_file(
} }
} }
} }
fn eval_default_config(
engine_state: &mut EngineState,
stack: &mut Stack,
config_file: &str,
is_env_config: bool,
) {
println!("Continuing without config file");
// 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)),
);
// Merge the environment in case env vars changed in the config
match nu_engine::env::current_dir(engine_state, stack) {
Ok(cwd) => {
if let Err(e) = engine_state.merge_env(stack, cwd) {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &e);
}
}
Err(e) => {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &e);
}
}
}