You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ki...@apache.org on 2022/06/02 02:50:15 UTC
[incubator-seatunnel] branch dev updated: [Core] [Fix] fix shell can't show help message (#1982)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new e619660a [Core] [Fix] fix shell can't show help message (#1982)
e619660a is described below
commit e619660a4b2421e03a29d391da695be1331f2a21
Author: Jia Fan <fa...@apache.org>
AuthorDate: Thu Jun 2 10:50:10 2022 +0800
[Core] [Fix] fix shell can't show help message (#1982)
* update contribute-plugin.md about plugin mapping.
* update contribute-plugin.md about plugin mapping.
* fix shell can't show help message
* Update seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh
Co-authored-by: Wenjun Ruan <we...@apache.org>
Co-authored-by: Wenjun Ruan <we...@apache.org>
---
.../src/main/bin/start-seatunnel-sql.sh | 7 ++-----
.../src/main/bin/start-seatunnel-flink.sh | 15 ++++++++++-----
.../src/main/bin/start-seatunnel-spark.sh | 10 +++++-----
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh b/seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh
index 9294a86b..41890ad9 100755
--- a/seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh
+++ b/seatunnel-core/seatunnel-core-flink-sql/src/main/bin/start-seatunnel-sql.sh
@@ -32,19 +32,16 @@ else
args=$@
fi
-ENV_PARAMETERS=$(java -cp ${APP_JAR} org.apache.seatunnel.core.sql.FlinkEnvParameterParser ${args})
-echo "Export JVM_ARGS: ${ENV_PARAMETERS}"
-export JVM_ARGS="${ENV_PARAMETERS}"
CMD=$(java -cp ${APP_JAR} org.apache.seatunnel.core.sql.FlinkSqlStarter ${args}) && EXIT_CODE=$? || EXIT_CODE=$?
if [ ${EXIT_CODE} -eq 234 ]; then
# print usage
- echo ${CMD}
+ echo "${CMD}"
exit 0
elif [ ${EXIT_CODE} -eq 0 ]; then
echo "Execute SeaTunnel Flink SQL Job: ${CMD}"
eval ${CMD}
else
- echo ${CMD}
+ echo "${CMD}"
exit ${EXIT_CODE}
fi
\ No newline at end of file
diff --git a/seatunnel-core/seatunnel-core-flink/src/main/bin/start-seatunnel-flink.sh b/seatunnel-core/seatunnel-core-flink/src/main/bin/start-seatunnel-flink.sh
index f9041d17..d135ae7d 100755
--- a/seatunnel-core/seatunnel-core-flink/src/main/bin/start-seatunnel-flink.sh
+++ b/seatunnel-core/seatunnel-core-flink/src/main/bin/start-seatunnel-flink.sh
@@ -32,19 +32,24 @@ else
args=$@
fi
-ENV_PARAMETERS=$(java -cp ${APP_JAR} org.apache.seatunnel.core.flink.FlinkEnvParameterParser ${args})
-echo "Export JVM_ARGS: ${ENV_PARAMETERS}"
-export JVM_ARGS="${ENV_PARAMETERS}"
+ENV_PARAMETERS_OR_ERROR=$(java -cp ${APP_JAR} org.apache.seatunnel.core.flink.FlinkEnvParameterParser ${args}) && EXIT_CODE=$? || EXIT_CODE=$?
+if [ ${EXIT_CODE} -eq 0 ]; then
+ echo "Export JVM_ARGS: ${ENV_PARAMETERS_OR_ERROR}"
+ export JVM_ARGS="${ENV_PARAMETERS_OR_ERROR}"
+else
+ echo "${ENV_PARAMETERS_OR_ERROR}"
+ exit ${EXIT_CODE}
+fi
CMD=$(java -cp ${APP_JAR} org.apache.seatunnel.core.flink.FlinkStarter ${args}) && EXIT_CODE=$? || EXIT_CODE=$?
if [ ${EXIT_CODE} -eq 234 ]; then
# print usage
- echo ${CMD}
+ echo "${CMD}"
exit 0
elif [ ${EXIT_CODE} -eq 0 ]; then
echo "Execute SeaTunnel Flink Job: ${CMD}"
eval ${CMD}
else
- echo ${CMD}
+ echo "${CMD}"
exit ${EXIT_CODE}
fi
diff --git a/seatunnel-core/seatunnel-core-spark/src/main/bin/start-seatunnel-spark.sh b/seatunnel-core/seatunnel-core-spark/src/main/bin/start-seatunnel-spark.sh
index a03c79dd..35ea18a9 100755
--- a/seatunnel-core/seatunnel-core-spark/src/main/bin/start-seatunnel-spark.sh
+++ b/seatunnel-core/seatunnel-core-spark/src/main/bin/start-seatunnel-spark.sh
@@ -31,15 +31,15 @@ else
args=$@
fi
-CMD=$(java -cp ${APP_JAR} org.apache.seatunnel.core.spark.SparkStarter ${args} | tail -n 1) && EXIT_CODE=$? || EXIT_CODE=$?
+CMD=$(java -cp ${APP_JAR} org.apache.seatunnel.core.spark.SparkStarter ${args}) && EXIT_CODE=$? || EXIT_CODE=$?
if [ ${EXIT_CODE} -eq 234 ]; then
# print usage
- echo ${CMD}
+ echo "${CMD}"
exit 0
elif [ ${EXIT_CODE} -eq 0 ]; then
- echo "Execute SeaTunnel Spark Job: ${CMD}"
- eval ${CMD}
+ echo "Execute SeaTunnel Spark Job: $(echo ${CMD} | tail -n 1)"
+ eval $(echo ${CMD} | tail -n 1)
else
- echo ${CMD}
+ echo "${CMD}"
exit ${EXIT_CODE}
fi