Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

fix: ~ in default config dir is not shell expanded #616

Closed
wants to merge 2 commits into from
Closed

fix: ~ in default config dir is not shell expanded #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7edbb4
Tilde was not shell escaped in config parser
its-me-yours-truly Jan 5, 2019
2d440d3
Merge branch 'master' into master
its-me-yours-truly Jan 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions application/comit_node/Cargo.toml
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ bitcoin_rpc_client = "0.4"
chrono = "0.4"
config = "0.9"
debug_stub_derive = "0.3"
directories = "1.0"
either = "1.5"
enum-display-derive = "0.1"
failure = "0.1"
Expand Down
25 changes: 18 additions & 7 deletions application/comit_node/src/bin/comit_node.rs
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@

#[macro_use]
extern crate log;
use directories;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ remove blank line between the use statements

use comit_node::{
comit_client, comit_server,
Expand Down Expand Up @@ -56,13 +57,23 @@ fn main() -> Result<(), failure::Error> {
}

fn load_settings() -> Result<ComitNodeSettings, config::ConfigError> {
let comit_config_path = var_or_default("COMIT_NODE_CONFIG_PATH", "~/.config/comit_node".into());
let run_mode_config = var_or_default("RUN_MODE", "development".into());
let default_config = format!("{}/{}", comit_config_path.trim(), "default");
let run_mode_config = format!("{}/{}", comit_config_path.trim(), run_mode_config);

let settings = ComitNodeSettings::create(default_config, run_mode_config)?;
Ok(settings)
match directories::UserDirs::new() {
None => Err(config::ConfigError::Message(
"could not determine user's home directory".to_string(),
)),
Some(dirs) => {
let default_config = std::path::Path::join(dirs.home_dir(), ".config/comit_node");
let comit_config_path = var_or_default(
"COMIT_NODE_CONFIG_PATH",
default_config.to_string_lossy().to_string(),
);
let run_mode_config = var_or_default("RUN_MODE", "development".into());
let default_config = format!("{}/{}", comit_config_path.trim(), "default");
let run_mode_config = format!("{}/{}", comit_config_path.trim(), run_mode_config);
let settings = ComitNodeSettings::create(default_config, run_mode_config)?;
Ok(settings)
}
}
}

fn create_ledger_query_service_api_client(
Expand Down