commit 63779893e14f71233eb3d1f1ebec40db5ee33319
author Vishal Suvagia <vishalsuvagia@apache.org> Tue Jun 18 11:26:25 2019 +0530
committer Sarath Subramanian <sarath@apache.org> Tue Jun 18 11:59:17 2019 -0700
tree 45b3581323f765ab87a9d22fe99ce50c8a3228cb
parent 59648d289ee8a8c36c1f8e4ba7f3807418a64639

ATLAS-3277 : Add default atlas conf path in the import-* scripts

addons/hbase-bridge/src/bin/import-hbase.sh

diff --git a/addons/hbase-bridge/src/bin/import-hbase.sh b/addons/hbase-bridge/src/bin/import-hbase.sh
index 2011eb9..b9c1a4b 100644
--- a/addons/hbase-bridge/src/bin/import-hbase.sh
+++ b/addons/hbase-bridge/src/bin/import-hbase.sh
@@ -55,6 +55,11 @@
   ATLASCPPATH="${ATLASCPPATH}:$i"
 done
 
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+    ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
 # log dir for applications
 ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-$BASEDIR/logs}"
 export ATLAS_LOG_DIR

addons/hive-bridge/src/bin/import-hive.sh

diff --git a/addons/hive-bridge/src/bin/import-hive.sh b/addons/hive-bridge/src/bin/import-hive.sh
index 366ddf1..38ec3be 100755
--- a/addons/hive-bridge/src/bin/import-hive.sh
+++ b/addons/hive-bridge/src/bin/import-hive.sh
@@ -50,6 +50,11 @@
   ATLASCPPATH="${ATLASCPPATH}:$i"
 done
 
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+    ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
 # log dir for applications
 ATLAS_LOG_DIR="${ATLAS_LOG_DIR:-$BASEDIR/logs}"
 export ATLAS_LOG_DIR

addons/impala-bridge/src/main/resources/import-impala.sh

diff --git a/addons/impala-bridge/src/main/resources/import-impala.sh b/addons/impala-bridge/src/main/resources/import-impala.sh
index 5ca8984..b440f2d 100644
--- a/addons/impala-bridge/src/main/resources/import-impala.sh
+++ b/addons/impala-bridge/src/main/resources/import-impala.sh
@@ -81,6 +81,11 @@
   ATLASCPPATH="${ATLASCPPATH}:$i"
 done
 
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+    ATLAS_CONF_DIR=/etc/atlas/conf
+fi
+ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
+
 echo "Logging: ${ATLAS_LOG_DIR}/${ATLAS_LOG_FILE}"
 echo "Log config: ${LOG_CONFIG}"
 

addons/kafka-bridge/src/bin/import-kafka.sh

diff --git a/addons/kafka-bridge/src/bin/import-kafka.sh b/addons/kafka-bridge/src/bin/import-kafka.sh
index 2af9efd..4bfb8b9 100644
--- a/addons/kafka-bridge/src/bin/import-kafka.sh
+++ b/addons/kafka-bridge/src/bin/import-kafka.sh
@@ -57,7 +57,9 @@
   ATLASCPPATH="${ATLASCPPATH}:$i"
 done
 
-ATLAS_CONF_DIR=/etc/atlas/conf
+if [ -z "${ATLAS_CONF_DIR}" ] && [ -e /etc/atlas/conf ];then
+    ATLAS_CONF_DIR=/etc/atlas/conf
+fi
 ATLASCPPATH=${ATLASCPPATH}:${ATLAS_CONF_DIR}
 
 # log dir for applications