MINOR: Cause 'ksql help' and 'ksql -help' to behave the same as 'ksql…

… -h' and 'ksql --help' (#2023)
confluentinc · Oct 12, 2018 · d27efe0 · d27efe0
1 parent c77af4b
commit d27efe0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/bin/ksql-run-class b/bin/ksql-run-class
@@ -89,14 +89,10 @@ if [ -z "$KSQL_JVM_PERFORMANCE_OPTS" ]; then
   KSQL_JVM_PERFORMANCE_OPTS="-server -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:+ExplicitGCInvokesConcurrent -XX:NewRatio=1 -Djava.awt.headless=true"
 fi
 
-usage() {
-    echo "USAGE: $0 [-daemon] [opts] [-help]"
-    exit 1
-}
-
 if [ $# -lt 1 ];
 then
-  usage
+  echo "USAGE: $0 [-daemon] [opts] [-help]"
+    exit 1
 fi
 
 MAIN="$1"
@@ -106,6 +102,9 @@ DAEMON_NAME=""
 GC_LOG_ENABLED=""
 DAEMON_MODE=""
 HELP=""
+if [ "$1" = "help" ]; then
+  HELP="true"
+fi
 while [ $# -gt 0 ]; do
   COMMAND="$1"
   case "$COMMAND" in
@@ -156,7 +155,8 @@ fi
 
 
 if [ "x$HELP" = "xtrue" ]; then
-  usage
+  exec "$JAVA" -cp "$KSQL_CLASSPATH" "$MAIN" --help
+  exit 1
 fi
 
 OPTIONS=($KSQL_HEAP_OPTS)

diff --git a/ksql-examples/src/main/java/io/confluent/ksql/datagen/DataGen.java b/ksql-examples/src/main/java/io/confluent/ksql/datagen/DataGen.java
@@ -277,7 +277,7 @@ Builder parseArgs(final String[] args) throws IOException {
       // CHECKSTYLE_RULES.OFF: CyclomaticComplexity
       private Builder parseArg(final String arg) throws IOException {
         // CHECKSTYLE_RULES.ON: CyclomaticComplexity
-        if ("help".equals(arg)) {
+        if ("help".equals(arg) || "--help".equals(arg)) {
           help = true;
           return this;
         }