[02/11] incubator-kylin git commit: fixed hadoop/hive lib directory detection to work with MapR paths (such as /opt/mapr/hive/hive-0.13/)

[lu...@apache.org]

fixed hadoop/hive lib directory detection to work with MapR paths (such as /opt/mapr/hive/hive-0.13/)

Signed-off-by: Li, Yang <ya...@ebay.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/bc8d3601
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/bc8d3601
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/bc8d3601

Branch: refs/heads/0.7
Commit: bc8d36011c413a232415fbc436d2953290982d5e
Parents: 4ab18c6
Author: c-horn <ch...@gmail.com>
Authored: Fri May 29 14:30:53 2015 -0400
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 4 17:21:36 2015 +0800

----------------------------------------------------------------------
 bin/find-hive-dependency.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bc8d3601/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --git a/bin/find-hive-dependency.sh b/bin/find-hive-dependency.sh
index 817697f..d8accfc 100644
--- a/bin/find-hive-dependency.sh
+++ b/bin/find-hive-dependency.sh
@@ -30,16 +30,16 @@ do
     then
         hive_exec_path=$data
     fi
-    result=`echo $data | grep 'hive/conf'`
+    result=`echo $data | grep -e 'hive[^/]*/conf'`
     if [ $result ]
     then
         hive_conf_path=$data
     fi
 done
-hdp_home=`echo $hive_exec_path | awk -F '/hive/lib/' '{print $1}'`
+hdp_home=`echo $hive_exec_path | awk -F '/hive.*/lib/' '{print $1}'`
 
 hcatalog=`find $hdp_home -name "hive-hcatalog-core[0-9\.-]*jar" 2>&1 | grep -m 1 -v 'Permission denied'`
-hive_lib=`find "$hdp_home/hive/lib" -name '*.jar' ! -name '*calcite*' -printf '%p:' | sed 's/:$//'`
+hive_lib=`find "$(dirname $hive_exec_path)" -name '*.jar' ! -name '*calcite*' -printf '%p:' | sed 's/:$//'`
 
 if [ -z "$hcatalog" ]
 then
@@ -49,4 +49,4 @@ fi
 
 hive_dependency=${hive_conf_path}:${hive_lib}:${hcatalog}
 echo "hive dependency: $hive_dependency"
-export hive_dependency
\ No newline at end of file
+export hive_dependency