YARN-7318. Fix shell check warnings of SLS. (Gergely Novák via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/281d8360 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/281d8360 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/281d8360 Branch: refs/heads/HDFS-9806 Commit: 281d83604df8341c210cee39bdc745ca793c5afa Parents: f36cbc8 Author: Wangda Tan <[email protected]> Authored: Fri Oct 20 15:54:01 2017 -0700 Committer: Wangda Tan <[email protected]> Committed: Fri Oct 20 15:54:15 2017 -0700 ---------------------------------------------------------------------- hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh | 3 +++ hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/281d8360/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh b/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh index 565dfe6..cda4e73 100644 --- a/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh +++ b/hadoop-tools/hadoop-sls/src/main/bin/rumen2sls.sh @@ -60,6 +60,8 @@ function calculate_classpath() function run_sls_generator() { + local args + if [[ -z "${outputprefix}" ]] ; then outputprefix="sls" fi @@ -88,6 +90,7 @@ HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}" # shellcheck disable=SC2034 HADOOP_NEW_CONFIG=true if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then + # shellcheck disable=SC1090 . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" else echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/281d8360/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh b/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh index cbc5bc9..e069a4c 100644 --- a/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh +++ b/hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh @@ -81,6 +81,8 @@ function calculate_classpath function run_simulation() { + local args + if [[ "${inputsls}" != "" ]] ; then hadoop_add_param args -inputsls "-inputsls ${inputsls}" fi @@ -126,6 +128,7 @@ HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-$HADOOP_DEFAULT_LIBEXEC_DIR}" # shellcheck disable=SC2034 HADOOP_NEW_CONFIG=true if [[ -f "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]]; then + # shellcheck disable=SC1090 . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" else echo "ERROR: Cannot execute ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh." 2>&1 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
