diff --git bin/hcat bin/hcat index 4dc721c..792a777 100644 --- bin/hcat +++ bin/hcat @@ -99,11 +99,11 @@ fi # Find our hcatalog jar shopt -s extglob -if (( `ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar | wc -l` > 1 )) ; then - echo "Error: found more than one hcatalog jar in $HCAT_PREFIX/share/hcatalog" +if [ "$(ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar | wc -l)" -ne 1 ]; then + echo "Error: found more than one hcatalog-core jar in $HCAT_PREFIX/share/hcatalog" exit 1 fi -HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar` +HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar` # Find the storage-handler jars. for jar in ${HCAT_PREFIX}/share/hcatalog/lib/*.jar ; do diff --git bin/hcat-config.sh bin/hcat-config.sh index a1e734e..c515b80 100644 --- bin/hcat-config.sh +++ bin/hcat-config.sh @@ -50,6 +50,8 @@ fi # Allow alternate conf dir location. if [ -e "${HCAT_PREFIX}/etc/hcatalog/hcat-env.sh" ]; then DEFAULT_CONF_DIR=${HCAT_PREFIX}/"etc/hcatalog" +elif [ -e "${HCAT_PREFIX}/conf/hcat-env.sh" ]; then + DEFAULT_CONF_DIR=${HCAT_PREFIX}/"conf" else DEFAULT_CONF_DIR="/etc/hcatalog" fi