diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2014-04-16 18:38:10 -0700 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-04-17 11:24:50 -0700 |
commit | 611419fcd8a19c06ca651add93deb66bdd0c55d5 (patch) | |
tree | 4c2ca4e4f2253556aa08f38f27e215f78a1c1383 /base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java | |
parent | 7c7cbb84f1c43ce3fbe33676f3e0f07fb7ecc2f9 (diff) | |
download | pki-611419fcd8a19c06ca651add93deb66bdd0c55d5.tar.gz pki-611419fcd8a19c06ca651add93deb66bdd0c55d5.tar.xz pki-611419fcd8a19c06ca651add93deb66bdd0c55d5.zip |
CLI argument parsing and bad return codes
* PKI TRAC Ticket #843 - Incorrect CLI argument parsing
* PKI TRAC Ticket #918 - CLI commands does not return code '1' for the failures
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java index a3d918e47..172f24934 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyShowCLI.java @@ -18,6 +18,8 @@ package com.netscape.cmstools.key; +import java.util.Arrays; + import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.ParseException; @@ -40,6 +42,13 @@ public class KeyShowCLI extends CLI { public void execute(String[] args) { + // Check for "--help" + if (Arrays.asList(args).contains("--help")) { + // Display usage + printHelp(); + System.exit(0); + } + if (args.length != 1) { printHelp(); System.exit(-1); @@ -53,10 +62,6 @@ public class KeyShowCLI extends CLI { printHelp(); System.exit(1); } - if (cmd.hasOption("help")) { - printHelp(); - System.exit(1); - } KeyId keyId = new KeyId(args[0].trim()); |