Repository: camel Updated Branches: refs/heads/master a0415d496 -> cf447ac21
CAMEL-8909 - fix jasypt CLI help output Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cf447ac2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cf447ac2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cf447ac2 Branch: refs/heads/master Commit: cf447ac21efb662a83cec0fc9de1218aa1f0efec Parents: a0415d4 Author: Jonathan Anstey <jans...@gmail.com> Authored: Sat Jun 27 15:11:13 2015 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Sat Jun 27 15:11:13 2015 -0230 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/component/jasypt/Main.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cf447ac2/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java ---------------------------------------------------------------------- diff --git a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java index cdd7e45..fd2baed 100644 --- a/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java +++ b/components/camel-jasypt/src/main/java/org/apache/camel/component/jasypt/Main.java @@ -103,10 +103,12 @@ public class Main { addOption(new Option("h", "help", "Displays the help screen") { protected void doProcess(String arg, LinkedList<String> remainingArgs) { showOptions(); + // no need to process further if user just wants help + System.exit(0); } }); - addOption(new ParameterOption("c", "command", "Command either encrypt or decrypt", "command") { + addOption(new ParameterOption("c", "command", "Command can be encrypt or decrypt", "command") { protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) { if ("encrypt".equals(parameter) || "decrypt".equals(parameter)) { command = parameter; @@ -140,7 +142,7 @@ public class Main { } private void showOptions() { - System.out.println("Apache Camel Jasypt takes the following options"); + System.out.println("Apache Camel Jasypt takes the following options:"); System.out.println(); for (Option option : options) { System.out.println(option.getInformation());
