From 861d829420ff28e387642659ffe256955352d939 Mon Sep 17 00:00:00 2001
From: Benjamin Kampmann <ben.kampmann@googlemail.com>
Date: Mon, 11 Jun 2018 20:38:01 +0200
Subject: [PATCH] Fix Cli Return Code on --help for ethkey, ethstore & whisper
 (#8863)

Docopt handles `--help` automatically for us, however we've handled those
Errors the same as all others: by exiting with Return Code `1`, which is wrong
for a totally appropriate a quit on `--help`. Fortunately `docopt:Error`
provides an `exit` helper function that discriminates properly between fatal
and non-fatal errors and exist appropriately.

This patch makes sure we use that handy function in case we encounter such an
error in the CLI of ethkey, ethstore and whisper. Thus those are now giving
the appropriate Return code on `--help`.

fixes #8851
---
 ethkey/cli/src/main.rs   | 3 ++-
 ethstore/cli/src/main.rs | 1 +
 whisper/cli/src/main.rs  | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ethkey/cli/src/main.rs b/ethkey/cli/src/main.rs
index c8f5e2e64..af50f86b3 100644
--- a/ethkey/cli/src/main.rs
+++ b/ethkey/cli/src/main.rs
@@ -166,10 +166,11 @@ fn main() {
 
 	match execute(env::args()) {
 		Ok(ok) => println!("{}", ok),
+		Err(Error::Docopt(ref e)) => e.exit(),
 		Err(err) => {
 			println!("{}", err);
 			process::exit(1);
-		},
+		}
 	}
 }
 
diff --git a/ethstore/cli/src/main.rs b/ethstore/cli/src/main.rs
index 416b64d43..922d85714 100644
--- a/ethstore/cli/src/main.rs
+++ b/ethstore/cli/src/main.rs
@@ -149,6 +149,7 @@ fn main() {
 
 	match execute(env::args()) {
 		Ok(result) => println!("{}", result),
+		Err(Error::Docopt(ref e)) => e.exit(),
 		Err(err) => {
 			println!("{}", err);
 			process::exit(1);
diff --git a/whisper/cli/src/main.rs b/whisper/cli/src/main.rs
index 6f3aec859..1d5769141 100644
--- a/whisper/cli/src/main.rs
+++ b/whisper/cli/src/main.rs
@@ -190,11 +190,12 @@ fn main() {
 		Ok(_) => {
 			println!("whisper-cli terminated");
 			process::exit(1);
-		}
+		},
+		Err(Error::Docopt(ref e)) => e.exit(),
 		Err(err) => {
 			println!("{}", err);
 			process::exit(1);
-		},
+		}
 	}
 }