From 5894397a07be022a7af96616403998c073bde7c4 Mon Sep 17 00:00:00 2001 From: Ashish Singhi Date: Fri, 19 Sep 2014 11:45:32 +0530 Subject: [PATCH] HBASE-12021 Hbase shell does not respect the HBASE_OPTS set by the user in console --- bin/hbase | 3 +++ bin/hbase.cmd | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bin/hbase b/bin/hbase index ec0aabc..4741ea7 100755 --- a/bin/hbase +++ b/bin/hbase @@ -52,6 +52,9 @@ # JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell. # Empty by default. # +# HBASE_SHELL_OPTS Extra options passed to the hbase shell. +# Empty by default. +# bin=`dirname "$0"` bin=`cd "$bin">/dev/null; pwd` diff --git a/bin/hbase.cmd b/bin/hbase.cmd index 9c923c4..2e75c38 100644 --- a/bin/hbase.cmd +++ b/bin/hbase.cmd @@ -42,6 +42,8 @@ @rem @rem JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell. @rem Empty by default. +@rem HBASE_SHELL_OPTS Extra options passed to the hbase shell. +@rem Empty by default. setlocal enabledelayedexpansion @@ -302,6 +304,7 @@ goto :eof ) else ( set HBASE_OPTS=%HBASE_OPTS% -Dhbase.ruby.sources="%HBASE_HOME%\hbase-shell\src\main\ruby" ) + set HBASE_OPTS=%HBASE_OPTS% %HBASE_SHELL_OPTS% set CLASS=org.jruby.Main -X+O %JRUBY_OPTS% "%HBASE_HOME%\bin\hirb.rb" goto :eof -- 1.9.2.msysgit.0