From 3b7ed7caffdbedfd30b022b8e2b3f93a2b6a494a Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Tue, 12 Apr 2022 21:47:07 +0100 Subject: fix env config parsing (#295) * fix env config parsing * fmt --- atuin-client/Cargo.toml | 2 +- atuin-client/src/settings.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'atuin-client') diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml index 0897fd3c..84395457 100644 --- a/atuin-client/Cargo.toml +++ b/atuin-client/Cargo.toml @@ -20,7 +20,7 @@ directories = "3" uuid = { version = "0.8", features = ["v4"] } whoami = "1.1.2" chrono-english = "0.1.4" -config = "0.12" +config = "0.13" serde_derive = "1.0.125" serde = "1.0.126" serde_json = "1.0.75" diff --git a/atuin-client/src/settings.rs b/atuin-client/src/settings.rs index ef6752fb..0e115909 100644 --- a/atuin-client/src/settings.rs +++ b/atuin-client/src/settings.rs @@ -148,7 +148,11 @@ impl Settings { .set_default("search_mode", "prefix")? .set_default("session_token", "")? .set_default("style", "auto")? - .add_source(Environment::with_prefix("atuin").separator("_")); + .add_source( + Environment::with_prefix("atuin") + .prefix_separator("_") + .separator("__"), + ); config_builder = if config_file.exists() { config_builder.add_source(ConfigFile::new( -- cgit v1.3.1