From e92ff00192d13ed2a073ba2afb2420900c70971c Mon Sep 17 00:00:00 2001
From: Thilo Fromm <github@thilo-fromm.de>
Date: Mon, 1 Dec 2014 15:19:40 +0100
Subject: [PATCH] bin/elasticsearch: add help, fix endless loop

This change adds command line help for all options to the es start script.
Both '-h' and '--help' options are accepted.

Also, an endless busy loop in the long options parser was fixed: running the
script with a long opt parameter w/o value (e.g. "elasticsearch --buuuurrrnn")
the long option parser would end up in an endless busy loop.

Signed-off-by: Thilo Fromm <github@thilo-fromm.de>
---
 bin/elasticsearch | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/bin/elasticsearch b/bin/elasticsearch
index 94b80f96f77..53b282d0400 100755
--- a/bin/elasticsearch
+++ b/bin/elasticsearch
@@ -1,8 +1,15 @@
 #!/bin/sh
 
 # OPTIONS:
-#   -d: daemonize, start in the background
-#   -p <filename>: log the pid to a file (useful to kill it later)
+#    -d            daemonize (run in background)
+#    -p pidfile    write PID to <pidfile>
+#    -h
+#    --help        print command line options
+#    -v            print elasticsearch version, then exit
+#    -D prop       set JAVA system property
+#    -X prop       set non-standard JAVA system property
+#   --prop=val
+#   --prop val     set elasticsearch property (i.e.  -Des.<prop>=<val>)
 
 # CONTROLLING STARTUP:
 #
@@ -156,16 +163,37 @@ launch_service()
     fi
 }
 
+# Print command line usage / help
+usage() {
+    echo "Usage: $0 [-vdh] [-p pidfile] [-D prop] [-X prop]"
+    echo "Start elasticsearch."
+    echo "    -d            daemonize (run in background)"
+    echo "    -p pidfile    write PID to <pidfile>"
+    echo "    -h"
+    echo "    --help        print command line options"
+    echo "    -v            print elasticsearch version, then exit"
+    echo "    -D prop       set JAVA system property"
+    echo "    -X prop       set non-standard JAVA system property"
+    echo "   --prop=val"
+    echo "   --prop val     set elasticsearch property (i.e. -Des.<prop>=<val>)"
+}
+
 # Parse any long getopt options and put them into properties before calling getopt below
 # Be dash compatible to make sure running under ubuntu works
 ARGV=""
 while [ $# -gt 0 ]
 do
     case $1 in
+      --help) ARGV="$ARGV -h"; shift;;
       --*=*) properties="$properties -Des.${1#--}"
            shift 1
            ;;
-      --*) properties="$properties -Des.${1#--}=$2"
+      --*) [ $# -le 1 ] && {
+                echo "Option requires an argument: '$1'."
+                shift
+                continue
+            }
+           properties="$properties -Des.${1#--}=$2"
            shift 2
            ;;
       *) ARGV="$ARGV $1" ; shift
@@ -192,7 +220,7 @@ while true; do
             shift
         ;;
         -h)
-            echo "Usage: $0 [-d] [-h] [-p pidfile]"
+            usage
             exit 0
         ;;
         -D)
@@ -209,6 +237,7 @@ while true; do
         ;;
         *)
             echo "Error parsing argument $1!" >&2
+            usage
             exit 1
         ;;
     esac