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

load config when requried (#5618)

Browse Source
This commit is contained in:
WindSoilder 2022-05-23 20:47:08 +08:00 committed by GitHub
parent 98a4280c41
commit a8db4f0b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.rs
View File

@ -195,6 +195,25 @@ fn main() -> Result<()> {
NUSHELL_FOLDER,
is_perf_true(),
);
// only want to load config and env if relative argument is provided.
if binary_args.config_file.is_some() {
config_files::read_config_file(
&mut engine_state,
&mut stack,
binary_args.config_file,
is_perf_true(),
false,
);
}
if binary_args.env_file.is_some() {
config_files::read_config_file(
&mut engine_state,
&mut stack,
binary_args.env_file,
is_perf_true(),
true,
);
}
let ret_val = evaluate_commands(
commands,
@ -217,6 +236,25 @@ fn main() -> Result<()> {
NUSHELL_FOLDER,
is_perf_true(),
);
// only want to load config and env if relative argument is provided.
if binary_args.config_file.is_some() {
config_files::read_config_file(
&mut engine_state,
&mut stack,
binary_args.config_file,
is_perf_true(),
false,
);
}
if binary_args.env_file.is_some() {
config_files::read_config_file(
&mut engine_state,
&mut stack,
binary_args.env_file,
is_perf_true(),
true,
);
}
let ret_val = evaluate_file(
script_name,