[hbase] branch branch-1.1 updated: HBASE-24550 Passing '-h' or '--help' to bin/hbase doesn't do as expected (#1947)

[vj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.1 by this push:
     new 45acab9  HBASE-24550 Passing '-h' or '--help' to bin/hbase doesn't do as expected (#1947)
45acab9 is described below

commit 45acab92b7f948208df4539c36b559f166971a48
Author: WenFeiYi <we...@gmail.com>
AuthorDate: Mon Jun 22 17:24:45 2020 +0800

    HBASE-24550 Passing '-h' or '--help' to bin/hbase doesn't do as expected (#1947)
    
    Signed-off-by: Viraj Jasani <vj...@apache.org>
---
 bin/hbase            | 49 +++++++++++++++++++++++++++++--------------------
 bin/hbase-config.cmd |  8 ++++++++
 bin/hbase-config.sh  |  4 ++++
 bin/hbase.cmd        |  9 +++++++++
 4 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index c920f32..159a64b 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -57,22 +57,7 @@
 bin=`dirname "$0"`
 bin=`cd "$bin">/dev/null; pwd`
 
-# This will set HBASE_HOME, etc.
-. "$bin"/hbase-config.sh
-
-cygwin=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-esac
-
-# Detect if we are in hbase sources dir
-in_dev_env=false
-if [ -d "${HBASE_HOME}/target" ]; then
-  in_dev_env=true
-fi
-
-# if no args specified, show usage
-if [ $# = 0 ]; then
+show_usage() {
   echo "Usage: hbase [<options>] <command> [<args>]"
   echo "Options:"
   echo "  --config DIR    Configuration direction to use. Default: ./conf"
@@ -89,11 +74,11 @@ if [ $# = 0 ]; then
   echo "  hfile           Store file analyzer"
   echo "  zkcli           Run the ZooKeeper shell"
   echo "  upgrade         Upgrade hbase"
-  echo "  master          Run an HBase HMaster node" 
-  echo "  regionserver    Run an HBase HRegionServer node" 
+  echo "  master          Run an HBase HMaster node"
+  echo "  regionserver    Run an HBase HRegionServer node"
   echo "  zookeeper       Run a Zookeeper server"
-  echo "  rest            Run an HBase REST server" 
-  echo "  thrift          Run the HBase Thrift server" 
+  echo "  rest            Run an HBase REST server"
+  echo "  thrift          Run the HBase Thrift server"
   echo "  thrift2         Run the HBase Thrift2 server"
   echo "  clean           Run the HBase clean up script"
   echo "  classpath       Dump hbase CLASSPATH"
@@ -102,6 +87,30 @@ if [ $# = 0 ]; then
   echo "  ltt             Run LoadTestTool"
   echo "  version         Print the version"
   echo "  CLASSNAME       Run the class named CLASSNAME"
+}
+
+if [ "--help" = "$1" ] || [ "-h" = "$1" ]; then
+  show_usage
+  exit 0
+fi
+
+# This will set HBASE_HOME, etc.
+. "$bin"/hbase-config.sh
+
+cygwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+esac
+
+# Detect if we are in hbase sources dir
+in_dev_env=false
+if [ -d "${HBASE_HOME}/target" ]; then
+  in_dev_env=true
+fi
+
+# if no args specified, show usage
+if [ $# = 0 ]; then
+  show_usage
   exit 1
 fi
 
diff --git a/bin/hbase-config.cmd b/bin/hbase-config.cmd
index 5c1f186..d70a88e 100644
--- a/bin/hbase-config.cmd
+++ b/bin/hbase-config.cmd
@@ -33,6 +33,14 @@ if "%1" == "--config" (
   shift
   shift
 )
+if "%1" == "--help" (
+  echo Error usage! You should use it like 'hbase --help' or 'hbase -h';
+  exit /B 2
+)
+if "%1" == "-h" (
+  echo Error usage! You should use it like 'hbase --help' or 'hbase -h';
+  exit /B 2
+)
 
 @rem the root of the hbase installation
 if not defined HBASE_HOME (
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index d7d7e6f..b329029 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -66,6 +66,10 @@ do
     shift
     # shellcheck disable=SC2034
     AUTH_AS_SERVER="true"
+  elif [ "--help" = "$1" ] || [ "-h" = "$1" ]
+  then
+    echo "Error usage! You should use it like 'hbase --help' or 'hbase -h'";
+    exit 1
   else
     # Presume we are at end of options and break
     break
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index da7bcd9..d5334fc 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -59,6 +59,15 @@ if "%HBASE_BIN_PATH:~-1%" == "\" (
   set HBASE_BIN_PATH=%HBASE_BIN_PATH:~0,-1%
 )
 
+if "%1" == "--help" (
+  goto :print_usage
+  exit /B 0
+)
+if "%1" == "-h" (
+  goto :print_usage
+  exit /B 0
+)
+
 rem This will set HBASE_HOME, etc.
 set hbase-config-script=%HBASE_BIN_PATH%\hbase-config.cmd
 call "%hbase-config-script%" %*