CLI/Keygen - fix shell return value on error

solana-labs · Mar 12, 2020 · 2c21011 · 2c21011
1 parent e7da4da
commit 2c21011
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -231,7 +231,19 @@ fn main() -> Result<(), Box<dyn error::Error>> {
     .get_matches();
 
     if let Err(e) = do_main(&matches) {
-        eprintln!("error: {}", e);
+        use thiserror::Error;
+
+        #[derive(Error)]
+        #[error("")]
+        struct PrettyError(String);
+
+        impl std::fmt::Debug for PrettyError {
+            fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(fmt, "{}", self.0)
+            }
+        }
+
+        return Err(PrettyError(e.to_string()).into());
     }
     Ok(())
 }

diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
@@ -17,6 +17,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.1.0" }
 solana-cli-config = { path = "../cli-config", version = "1.1.0" }
 solana-remote-wallet = { path = "../remote-wallet", version = "1.1.0" }
 solana-sdk = { path = "../sdk", version = "1.1.0" }
+thiserror = "1.0.11"
 tiny-bip39 = "0.7.0"
 
 [[bin]]

diff --git a/keygen/src/keygen.rs b/keygen/src/keygen.rs
@@ -193,7 +193,19 @@ fn grind_parse_args(
 fn main() -> Result<(), Box<dyn error::Error>> {
     let result = do_main().err();
     if let Some(err) = result {
-        eprintln!("hi! {}", err);
+        use thiserror::Error;
+
+        #[derive(Error)]
+        #[error("")]
+        struct PrettyError(String);
+
+        impl std::fmt::Debug for PrettyError {
+            fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(fmt, "{}", self.0)
+            }
+        }
+
+        return Err(PrettyError(err.to_string()).into());
     }
     Ok(())
 }