From 623f8fb585fc8875405cfde58ab87b285a042419 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 5 Aug 2022 23:22:17 +0800 Subject: [PATCH] feat: v1.3.4 return error codes --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/cmd_chall.rs | 1 + src/cmd_challconfig.rs | 1 + src/main.rs | 6 ++++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 407b057..86d49b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "card-cli" -version = "1.3.3" +version = "1.3.4" dependencies = [ "authenticator", "base64 0.13.0", diff --git a/Cargo.toml b/Cargo.toml index f49e173..b812c13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "card-cli" -version = "1.3.3" +version = "1.3.4" authors = ["Hatter Jiang "] edition = "2018" diff --git a/src/cmd_chall.rs b/src/cmd_chall.rs index 4a4f134..0d87836 100644 --- a/src/cmd_chall.rs +++ b/src/cmd_chall.rs @@ -85,6 +85,7 @@ impl Command for CommandImpl { } } else { warning!("YubiKey not found"); + return Ok(Some(1)); } Ok(None) diff --git a/src/cmd_challconfig.rs b/src/cmd_challconfig.rs index 4803167..50ce2ec 100644 --- a/src/cmd_challconfig.rs +++ b/src/cmd_challconfig.rs @@ -58,6 +58,7 @@ impl Command for CommandImpl { } } else { warning!("YubiKey not found"); + return Ok(Some(1)); } Ok(None) diff --git a/src/main.rs b/src/main.rs index da415de..519d9d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -42,8 +42,10 @@ impl DefaultCommandImpl { } fn main() { - if let Err(e) = inner_main() { - failure_and_exit!("Run cli error: {}", e); + match inner_main() { + Err(e) => failure_and_exit!("Run cli error: {}", e), + Ok(Some(code)) => std::process::exit(code), + Ok(None) => (), } }