Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Autocreating geth dir if none and geth mode on #1896

Merged
merged 3 commits into from
Aug 9, 2016
Merged

Autocreating geth dir if none and geth mode on #1896

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb318e
fix regression with geth dir
NikVolf Aug 9, 2016
dcdd42f
fix regression with geth dir
NikVolf Aug 9, 2016
26ff6af
Merge branch 'fix-geth-2' of github.com:ethcore/parity into fix-geth-2
NikVolf Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions parity/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,8 @@ impl Configuration {
}

fn directories(&self) -> Directories {
use util::path;

let db_path = replace_home(self.args.flag_datadir.as_ref().unwrap_or(&self.args.flag_db_path));

let keys_path = replace_home(
Expand All @@ -524,6 +526,12 @@ impl Configuration {
let dapps_path = replace_home(&self.args.flag_dapps_path);
let signer_path = replace_home(&self.args.flag_signer_path);

if self.args.flag_geth {
let geth_path = path::ethereum::default();
::std::fs::create_dir_all(geth_path.as_path()).unwrap_or_else(
|e| warn!("Failed to create '{}' for geth mode: {}", &geth_path.to_str().unwrap(), e));
}

Directories {
keys: keys_path,
db: db_path,
Expand Down