From 9fdd5e5f20dce5d6def65fe15ac586832578b2d9 Mon Sep 17 00:00:00 2001 From: gmart7t2 <49558347+gmart7t2@users.noreply.github.com> Date: Sat, 15 Jul 2023 20:18:35 -0300 Subject: [PATCH] Don't create default data directory if --index overrides it (#1991) --- src/index.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/index.rs b/src/index.rs index 152851771a..619e48d6bd 100644 --- a/src/index.rs +++ b/src/index.rs @@ -176,18 +176,19 @@ impl Index { pub(crate) fn open(options: &Options) -> Result { let client = options.bitcoin_rpc_client()?; - let data_dir = options.data_dir()?; - - if let Err(err) = fs::create_dir_all(&data_dir) { - bail!("failed to create data dir `{}`: {err}", data_dir.display()); - } - let path = if let Some(path) = &options.index { path.clone() } else { - data_dir.join("index.redb") + options.data_dir()?.join("index.redb") }; + if let Err(err) = fs::create_dir_all(path.parent().unwrap()) { + bail!( + "failed to create data dir `{}`: {err}", + path.parent().unwrap().display() + ); + } + let db_cache_size = match options.db_cache_size { Some(db_cache_size) => db_cache_size, None => {