svn commit: r1205180 - in /pig/trunk: CHANGES.txt bin/pig

[ha...@apache.org]

Author: hashutosh
Date: Tue Nov 22 21:24:31 2011
New Revision: 1205180

URL: http://svn.apache.org/viewvc?rev=1205180&view=rev
Log:
PIG-2327: bin/pig doesn't have any hooks for picking up ZK installation deployed from tarballs (rvs via hashutosh)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/bin/pig

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1205180&r1=1205179&r2=1205180&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Nov 22 21:24:31 2011
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
 
 IMPROVEMENTS
 
+PIG-2327: bin/pig doesn't have any hooks for picking up ZK installation deployed from tarballs (rvs via hashutosh)
+
 PIG-2382: Modify .gitignore to ignore pig-withouthadoop.jar (azaroth via hashutosh)
 
 PIG-2380: Expose version information more cleanly (jcoveney via azaroth)

Modified: pig/trunk/bin/pig
URL: http://svn.apache.org/viewvc/pig/trunk/bin/pig?rev=1205180&r1=1205179&r2=1205180&view=diff
==============================================================================
--- pig/trunk/bin/pig (original)
+++ pig/trunk/bin/pig Tue Nov 22 21:24:31 2011
@@ -182,15 +182,17 @@ if [ -d "${PIG_HOME}/etc/hadoop" ]; then
 fi
 
 # locate ZooKeeper
-if [ -d "${PIG_HOME}/share/zookeeper" ]; then
-    for f in ${PIG_HOME}/share/zookeeper/zookeeper-*.jar; do
+ZKH=${ZOOKEEPER_HOME:-"${PIG_HOME}/share/zookeeper"}
+if [ -d "$ZKH" ] ; then
+    for f in ${ZKH}/zookeeper-*.jar; do
         CLASSPATH=${CLASSPATH}:$f
     done
 fi
 
 # locate HBase
-if [ -d "${PIG_HOME}/share/hbase" ]; then
-    for f in ${PIG_HOME}/share/hbase/hbase-*.jar; do
+HBH=${HBASE_HOME:-"${PIG_HOME}/share/hbase"}
+if [ -d "$HBH" ]; then
+    for f in ${HBH}/hbase-*.jar; do
         CLASSPATH=${CLASSPATH}:$f
     done
 fi