From bf446f44f97a5f9df7c7c274e5d78981b6b2287c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Thu, 11 Apr 2019 15:41:13 +0200 Subject: [PATCH] Enable DATA_FOLDER to affect default CONFIG_FILE path --- src/config.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config.rs b/src/config.rs index 3a7a85f..309b65a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -9,7 +9,10 @@ lazy_static! { println!("Error loading config:\n\t{:?}\n", e); exit(12) }); - pub static ref CONFIG_FILE: String = get_env("CONFIG_FILE").unwrap_or_else(|| "data/config.json".into()); + pub static ref CONFIG_FILE: String = { + let data_folder = get_env("DATA_FOLDER").unwrap_or_else(|| String::from("data")); + get_env("CONFIG_FILE").unwrap_or_else(|| format!("{}/config.json", data_folder)) + }; } pub type Pass = String;