Merge pull request #32 from holochain/patch-1

Patch 1

crates/lair_keystore/src/bin/lair-keystore/main.rs

@@ -5,15 +5,33 @@
 use structopt::StructOpt;
 use tracing::*;
 
+static LAIR_KEYSTORE_ABOUT: &str = r#"A secure storage system for Holochain cryptographic keys and secrets.
+
+- one `lair-keystore` per `holochain`
+- attaches the secure storage and IPC process
+    to a directory configurable via command
+    line options. a sensible platform specific
+    dir will be used as a default dir (and be
+    logged when executed)"#;
+
 #[derive(Debug, StructOpt)]
-#[structopt(name = "lair-keystore")]
+#[structopt(
+    name = "lair-keystore",
+    about = LAIR_KEYSTORE_ABOUT
+)]
 struct Opt {
     /// Print out version info and exit.
     #[structopt(short, long)]
     version: bool,
 
     /// Set the lair data directory.
-    #[structopt(short = "d", long, env = "LAIR_DIR")]
+    #[structopt(
+        short = "d",
+        long,
+        env = "LAIR_DIR",
+        help = "Can be used to override the default keystore
+directory to run multiple instances or for other purposes"
+    )]
     lair_dir: Option<std::path::PathBuf>,
 }
 

crates/lair_keystore/src/lib.rs

@@ -29,6 +29,8 @@ pub async fn execute_lair() -> LairResult<()> {
 
     let config = config.build();
 
+    println!("#lair-keystore-dir:{:?}#", config.get_root_path());
+
     let internal::pid_check::PidCheckResult { store_file } =
         internal::pid_check::pid_check(&config)?;