From a1cbab731ddaceaf768f6eb9206119cbca86d794 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Mon, 8 Apr 2019 15:47:43 +1200 Subject: [PATCH] Undo shellcheck change in job.sh (trap needs spaced string values) --- lib/cylc/job.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cylc/job.sh b/lib/cylc/job.sh index f7fe3827e04..c3f93e4e436 100644 --- a/lib/cylc/job.sh +++ b/lib/cylc/job.sh @@ -147,7 +147,9 @@ cylc__job__main() { # Send task succeeded message wait "${CYLC_TASK_MESSAGE_STARTED_PID}" 2>'/dev/null' || true cylc message -- "${CYLC_SUITE_NAME}" "${CYLC_TASK_JOB}" 'succeeded' || true - trap '' "${CYLC_VACATION_SIGNALS:-}" "${CYLC_FAIL_SIGNALS}" + # (Ignore shellcheck "globbing and word splitting" warning here). + # shellcheck disable=SC2086 + trap '' ${CYLC_VACATION_SIGNALS:-} ${CYLC_FAIL_SIGNALS} # Execute success exit script cylc__job__run_inst_func 'exit_script' exit 0 @@ -186,7 +188,9 @@ cylc__job_finish_err() { typeset run_err_script="$2" shift 2 typeset signal_name= - trap '' "${CYLC_VACATION_SIGNALS:-}" "${CYLC_FAIL_SIGNALS}" + # (Ignore shellcheck "globbing and word splitting" warning here). + # shellcheck disable=SC2086 + trap '' ${CYLC_VACATION_SIGNALS:-} ${CYLC_FAIL_SIGNALS} if [[ -n "${CYLC_TASK_MESSAGE_STARTED_PID:-}" ]]; then wait "${CYLC_TASK_MESSAGE_STARTED_PID}" 2>'/dev/null' || true fi