Repository: kylin Updated Branches: refs/heads/2.x-staging 4afd144af -> 5d16f9bf6
minor: give find command -L option to follow all symbolic links Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/91b1f922 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/91b1f922 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/91b1f922 Branch: refs/heads/2.x-staging Commit: 91b1f922314fbc113709de41add140f4e01382b0 Parents: 4afd144 Author: honma <ho...@ebay.com> Authored: Mon Nov 23 13:36:49 2015 +0800 Committer: honma <ho...@ebay.com> Committed: Fri Dec 4 17:02:02 2015 +0800 ---------------------------------------------------------------------- build/bin/cleanup_streaming_files.sh | 2 +- build/bin/find-hive-dependency.sh | 4 ++-- build/bin/sample.sh | 2 +- build/bin/streaming_rolllog.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/91b1f922/build/bin/cleanup_streaming_files.sh ---------------------------------------------------------------------- diff --git a/build/bin/cleanup_streaming_files.sh b/build/bin/cleanup_streaming_files.sh index 3837a2d..4fc9f0e 100644 --- a/build/bin/cleanup_streaming_files.sh +++ b/build/bin/cleanup_streaming_files.sh @@ -8,7 +8,7 @@ fi cd $KYLIN_HOME/logs -for pidfile in `find . -name "$1_1*"` +for pidfile in `find -L . -name "$1_1*"` do pidfile=`echo "$pidfile" | cut -c 3-` echo "pidfile:$pidfile" http://git-wip-us.apache.org/repos/asf/kylin/blob/91b1f922/build/bin/find-hive-dependency.sh ---------------------------------------------------------------------- diff --git a/build/bin/find-hive-dependency.sh b/build/bin/find-hive-dependency.sh index 47f0fbc..5994dda 100644 --- a/build/bin/find-hive-dependency.sh +++ b/build/bin/find-hive-dependency.sh @@ -55,7 +55,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 @@ -64,7 +64,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/kylin/blob/91b1f922/build/bin/sample.sh ---------------------------------------------------------------------- diff --git a/build/bin/sample.sh b/build/bin/sample.sh index 6931457..a71d43f 100644 --- a/build/bin/sample.sh +++ b/build/bin/sample.sh @@ -1,7 +1,7 @@ #!/bin/bash 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; } http://git-wip-us.apache.org/repos/asf/kylin/blob/91b1f922/build/bin/streaming_rolllog.sh ---------------------------------------------------------------------- diff --git a/build/bin/streaming_rolllog.sh b/build/bin/streaming_rolllog.sh index 9380f49..1fa5bb7 100644 --- a/build/bin/streaming_rolllog.sh +++ b/build/bin/streaming_rolllog.sh @@ -7,6 +7,6 @@ KYLIN_LOG_HOME=${KYLIN_HOME}/logs cd ${KYLIN_LOG_HOME} timestamp=`date +%Y_%m_%d_%H_%M_%S` tarfile=logs_archived_at_${timestamp}.tar -files=`find . ! -name '*.tar' -type f -mtime +1` # keep two days' log +files=`find -L . ! -name '*.tar' -type f -mtime +1` # keep two days' log echo ${files} | xargs tar -cvf ${tarfile} echo ${files} | xargs rm \ No newline at end of file
