Author: khorgath
Date: Wed Apr 24 22:17:52 2013
New Revision: 1471737
URL: http://svn.apache.org/r1471737
Log:
HIVE-4419 : webhcat - support ${WEBHCAT_PREFIX}/conf/ as config directory
(Thejas M Nair via Sushanth Sowmyan)
Modified:
hive/trunk/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
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=1471737&r1=1471736&r2=1471737&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 Wed Apr 24
22:17:52 2013
@@ -64,6 +64,8 @@ fi
# Allow alternate conf dir location.
if [ -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-env.sh" ]; then
DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"etc/webhcat"
+elif [ -e "${WEBHCAT_PREFIX}/conf/webhcat-env.sh" ]; then
+ DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"conf"
else
DEFAULT_CONF_DIR="/etc/webhcat"
fi
