You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/11/23 06:35:35 UTC
incubator-kylin git commit: add -L option to find command to follow
symbolic links
Repository: incubator-kylin
Updated Branches:
refs/heads/1.x-staging 320c72ccb -> 26f1665e2
add -L option to find command to follow symbolic links
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/26f1665e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/26f1665e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/26f1665e
Branch: refs/heads/1.x-staging
Commit: 26f1665e22ddbd67966b2f7de32571845b962993
Parents: 320c72c
Author: honma <ho...@ebay.com>
Authored: Mon Nov 23 13:41:17 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Mon Nov 23 13:41:17 2015 +0800
----------------------------------------------------------------------
bin/find-hive-dependency.sh | 6 +++---
bin/sample.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/26f1665e/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --git a/bin/find-hive-dependency.sh b/bin/find-hive-dependency.sh
index ea2e161..cb5a43e 100755
--- a/bin/find-hive-dependency.sh
+++ b/bin/find-hive-dependency.sh
@@ -40,7 +40,7 @@ done
# in some versions of hive hcatalog is not in hive's classpath, find it separately
if [ -z "$HCAT_HOME" ]
then
- echo "HCAT_HOME not found, try to find hcatalog path from hive home"
+ echo "HCAT_HOME not found, try to find hcatalog path from hadoop home"
hadoop_home=`echo $hive_exec_path | awk -F '/hive.*/lib/' '{print $1}'`
if [ -d "${hadoop_home}/hive-hcatalog" ]; then
hcatalog_home=${hadoop_home}/hive-hcatalog
@@ -53,7 +53,7 @@ else
hcatalog_home=${HCAT_HOME}
fi
-hcatalog=`find ${hcatalog_home} -name "hive-hcatalog-core[0-9\.-]*jar" 2>&1 | grep -m 1 -v 'Permission denied'`
+hcatalog=`find -L ${hcatalog_home} -name "hive-hcatalog-core[0-9\.-]*jar" 2>&1 | grep -m 1 -v 'Permission denied'`
if [ -z "$hcatalog" ]
then
@@ -62,7 +62,7 @@ then
fi
-hive_lib=`find "$(dirname $hive_exec_path)" -name '*.jar' ! -name '*calcite*' -printf '%p:' | sed 's/:$//'`
+hive_lib=`find -L "$(dirname $hive_exec_path)" -name '*.jar' ! -name '*calcite*' -printf '%p:' | sed 's/:$//'`
hive_dependency=${hive_conf_path}:${hive_lib}:${hcatalog}
echo "hive dependency: $hive_dependency"
export hive_dependency
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/26f1665e/bin/sample.sh
----------------------------------------------------------------------
diff --git a/bin/sample.sh b/bin/sample.sh
index d53393c..e02ef51 100755
--- a/bin/sample.sh
+++ b/bin/sample.sh
@@ -19,7 +19,7 @@
dir=$(dirname ${0})
source ${dir}/check-env.sh
-job_jar=`find ${KYLIN_HOME}/lib/ -name kylin-job*.jar`
+job_jar=`find -L ${KYLIN_HOME}/lib/ -name kylin-job*.jar`
echo "Going to create sample tables in hive..."
cd ${KYLIN_HOME}/sample_cube/data
hive -f ${KYLIN_HOME}/sample_cube/create_sample_tables.sql || { exit 1; }