Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5245 HBase shell should use alternate jruby if JRUBY_HOME is set, should pass along JRUBY_OPTS 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1234626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-01-22 21:57:48 +00:00
parent 3724f4859b
commit 0d61857881
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/hbase
View File

@ -45,6 +45,12 @@
#
# MAVEN_HOME Where mvn is installed.
#
# JRUBY_HOME JRuby path: $JRUBY_HOME/lib/jruby.jar should exist.
# Defaults to the jar packaged with HBase.
#
# JRUBY_OPTS Extra options (eg '--1.9') passed to the hbase shell.
# Empty by default.
#
bin=`dirname "$0"`
bin=`cd "$bin">/dev/null; pwd`
@ -262,7 +268,12 @@ unset IFS
# figure out which class to run
if [ "$COMMAND" = "shell" ] ; then
CLASS="org.jruby.Main -X+O ${HBASE_HOME}/bin/hirb.rb"
# eg export JRUBY_HOME=/usr/local/share/jruby
if [ "$JRUBY_HOME" != "" ] ; then
CLASSPATH="$JRUBY_HOME/lib/jruby.jar:$CLASSPATH"
HBASE_OPTS="$HBASE_OPTS -Djruby.home=$JRUBY_HOME -Djruby.lib=$JRUBY_HOME/lib"
fi
CLASS="org.jruby.Main -X+O ${JRUBY_OPTS} ${HBASE_HOME}/bin/hirb.rb"
elif [ "$COMMAND" = "hbck" ] ; then
CLASS='org.apache.hadoop.hbase.util.HBaseFsck'
elif [ "$COMMAND" = "hlog" ] ; then