svn commit: r1565778 - in /hive/trunk: hcatalog/bin/common.sh hcatalog/bin/hcat-config.sh hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh packaging/src/main/assembly/bin.xml

[th...@apache.org]

Author: thejas
Date: Fri Feb  7 19:54:19 2014
New Revision: 1565778

URL: http://svn.apache.org/r1565778
Log:
HIVE-6377 : make HADOOP_HOME setting consistent between hive and webhcat_config.sh (Eugene Koifman via Thejas Nair)

Added:
    hive/trunk/hcatalog/bin/common.sh
Modified:
    hive/trunk/hcatalog/bin/hcat-config.sh
    hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
    hive/trunk/packaging/src/main/assembly/bin.xml

Added: hive/trunk/hcatalog/bin/common.sh
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/bin/common.sh?rev=1565778&view=auto
==============================================================================
--- hive/trunk/hcatalog/bin/common.sh (added)
+++ hive/trunk/hcatalog/bin/common.sh Fri Feb  7 19:54:19 2014
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#====================================
+#determine HADOOP_HOME if possible
+#====================================
+function find_hadoop_home() {
+  # check for hadoop in the path
+  HADOOP_IN_PATH=`which hadoop 2>/dev/null`
+  if [ -f ${HADOOP_IN_PATH} ]; then
+    HADOOP_DIR=`dirname "$HADOOP_IN_PATH"`/..
+  fi
+  # HADOOP_HOME env variable overrides hadoop in the path
+  HADOOP_HOME=${HADOOP_HOME:-${HADOOP_PREFIX:-$HADOOP_DIR}}
+  if [ "$HADOOP_HOME" == "" ]; then
+    echo "Cannot find hadoop installation: \$HADOOP_HOME or \$HADOOP_PREFIX must be set or hadoop must be in the path";
+    exit 4;
+  fi
+
+  HADOOP=$HADOOP_HOME/bin/hadoop
+  if [ ! -f ${HADOOP} ]; then
+    echo "Cannot find hadoop installation: \$HADOOP_HOME or \$HADOOP_PREFIX must be set or hadoop must be in the path";
+    exit 4;
+  fi
+}

Modified: hive/trunk/hcatalog/bin/hcat-config.sh
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/bin/hcat-config.sh?rev=1565778&r1=1565777&r2=1565778&view=diff
==============================================================================
--- hive/trunk/hcatalog/bin/hcat-config.sh (original)
+++ hive/trunk/hcatalog/bin/hcat-config.sh Fri Feb  7 19:54:19 2014
@@ -65,6 +65,9 @@ if [ -f "${HCAT_CONF_DIR}/hcat-env.sh" ]
   . "${HCAT_CONF_DIR}/hcat-env.sh"
 fi
 
+source $HCAT_PREFIX/bin/common.sh
+find_hadoop_home
+
 #determine where hadoop is
 #check HADOOP_HOME and then check HADOOP_PREFIX
 if [ -f ${HADOOP_HOME}/bin/hadoop ]; then

Modified: hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1565778&r1=1565777&r2=1565778&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh (original)
+++ hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Fri Feb  7 19:54:19 2014
@@ -111,6 +111,9 @@ if [ ! -d ${TEMPLETON_HOME}/share/webhca
     die "TEMPLETON_HOME=${TEMPLETON_HOME} is invalid";
 fi
 
+source $WEBHCAT_PREFIX/bin/common.sh
+find_hadoop_home
+
 #====================================
 #determine where hadoop is
 #====================================

Modified: hive/trunk/packaging/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/hive/trunk/packaging/src/main/assembly/bin.xml?rev=1565778&r1=1565777&r2=1565778&view=diff
==============================================================================
--- hive/trunk/packaging/src/main/assembly/bin.xml (original)
+++ hive/trunk/packaging/src/main/assembly/bin.xml Fri Feb  7 19:54:19 2014
@@ -259,6 +259,7 @@
         <include>hcatcfg.py</include>
         <include>hcat.py</include>
         <include>templeton.cmd</include>
+        <include>common.sh</include>
       </includes>
       <outputDirectory>hcatalog/bin</outputDirectory>
     </fileSet>