This is an automated email from the ASF dual-hosted git repository.
nic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new 178c737 KYLIN-3698 Fix kylin.sh can't export spark/flink/kafka
dependency
178c737 is described below
commit 178c7377d39b004144e54b1c931c92be82fe76de
Author: yaqian.zhang <598593...@qq.com>
AuthorDate: Fri May 22 13:42:10 2020 +0800
KYLIN-3698 Fix kylin.sh can't export spark/flink/kafka dependency
---
build/bin/check-env.sh | 12 ++++++------
build/bin/find-flink-dependency.sh | 1 -
build/bin/find-kafka-dependency.sh | 1 -
build/bin/find-spark-dependency.sh | 1 -
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/build/bin/check-env.sh b/build/bin/check-env.sh
index e3b61c7..573b600 100755
--- a/build/bin/check-env.sh
+++ b/build/bin/check-env.sh
@@ -84,27 +84,27 @@ else
fi
-bash ${dir}/find-spark-dependency.sh
+source ${dir}/find-spark-dependency.sh
rtn=$?
if [[ $rtn == 0 ]]; then
echo "...................................................[`setColor 32
PASS`]"
-elif [[ $rtn == 3 ]]; then
+else
echo "...................................................[`setColor 33
SKIP`]"
fi
-bash ${dir}/find-flink-dependency.sh
+source ${dir}/find-flink-dependency.sh
rtn=$?
if [[ $rtn == 0 ]]; then
echo "...................................................[`setColor 32
PASS`]"
-elif [[ $rtn == 3 ]]; then
+else
echo "...................................................[`setColor 33
SKIP`]"
fi
-bash ${dir}/find-kafka-dependency.sh
+source ${dir}/find-kafka-dependency.sh
rtn=$?
if [[ $rtn == 0 ]]; then
echo "...................................................[`setColor 32
PASS`]"
-elif [[ $rtn == 3 ]]; then
+else
echo "...................................................[`setColor 33
SKIP`]"
fi
diff --git a/build/bin/find-flink-dependency.sh
b/build/bin/find-flink-dependency.sh
index 10f3643..ea09a38 100755
--- a/build/bin/find-flink-dependency.sh
+++ b/build/bin/find-flink-dependency.sh
@@ -39,7 +39,6 @@ if [ ! -d "$flink_home/lib" ]
then
echo `setColor 33 "Optional dependency flink not found, if you need this;
set FLINK_HOME, or run bin/download-flink.sh"`
echo "echo 'skip flink_dependency'" > ${dir}/cached-flink-dependency.sh
- exit 3
else
flink_dependency=`find -L $flink_home/lib -name '*.jar' ! -name
'*shaded-hadoop*' ! -name 'kafka*' ! -name '*log4j*' ! -name '*slf4j*' ! -name
'*calcite*' ! -name '*doc*' ! -name '*test*' ! -name '*sources*' ''-printf
'%p:' | sed 's/:$//'`
if [ -z "$flink_dependency" ]
diff --git a/build/bin/find-kafka-dependency.sh
b/build/bin/find-kafka-dependency.sh
index 4782680..7a293b5 100755
--- a/build/bin/find-kafka-dependency.sh
+++ b/build/bin/find-kafka-dependency.sh
@@ -28,7 +28,6 @@ echo Retrieving kafka dependency...
if [ -z "$KAFKA_HOME" ]
then
echo "Couldn't find kafka home. If you want to enable streaming
processing, Please set KAFKA_HOME to the path which contains kafka
dependencies."
- exit 3
else
verbose "KAFKA_HOME is set to: $KAFKA_HOME, use it to locate kafka
dependencies."
kafka_home=$KAFKA_HOME
diff --git a/build/bin/find-spark-dependency.sh
b/build/bin/find-spark-dependency.sh
index 2321cea..0ea7ab2 100755
--- a/build/bin/find-spark-dependency.sh
+++ b/build/bin/find-spark-dependency.sh
@@ -59,7 +59,6 @@ if [ ! -d "$spark_home/jars" ]
then
echo `setColor 33 "Optional dependency spark not found, if you need this;
set SPARK_HOME, or run bin/download-spark.sh"`
echo "echo 'skip spark_dependency'" > ${dir}/cached-spark-dependency.sh
- exit 3
else
spark_dependency=`find -L $spark_home/jars -name '*.jar' ! -name '*slf4j*'
! -name '*calcite*' ! -name '*doc*' ! -name '*test*' ! -name '*sources*'
''-printf '%p:' | sed 's/:$//'`
if [ -z "$spark_dependency" ]
