From 7f29f0621e1410580f9e75d3de6d63cbd457d9a7 Mon Sep 17 00:00:00 2001 From: Robert Wlodarczyk Date: Sat, 16 Jul 2022 08:51:38 -0700 Subject: [PATCH] chore: standardizing on env vars. --- docker-entrypoint | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docker-entrypoint b/docker-entrypoint index 3987ea5..e44ded5 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -195,8 +195,9 @@ function build_crontab() { fi SCHEDULE=$(parse_schedule "${SCHEDULE}" | sed 's/\\//g') - if [ "$(jq -r .["$i"].command "${CONFIG}")" == "null" ]; then - echo "Command Missing: $(jq -r .["$i"].command "${CONFIG}")" + COMMAND=$(jq -r .["$i"].command "${CONFIG}") + if [ "${COMMAND}" == "null" ]; then + echo "Command Missing: '${COMMAND}'" continue fi @@ -220,10 +221,12 @@ echo "Start Cronjob **${SCRIPT_NAME}** ${COMMENT}" $(make_cmd "$(jq -c .["$i"] "${CONFIG}")") EOF - if [ "$(jq -r .["$i"].trigger "${CONFIG}")" != "null" ]; then + TRIGGER=$(jq -r .["$i"].trigger "${CONFIG}") + if [ "${TRIGGER}" != "null" ]; then while read -r j ; do - if [ "$(jq .["$i"].trigger["$j"].command "${CONFIG}")" == "null" ]; then - echo "Command Missing: $(jq -r .["$i"].trigger["$j"].command "${CONFIG}")" + TRIGGER_COMMAND=$(jq .["$i"].trigger["$j"].command "${CONFIG}") + if [ "${TRIGGER_COMMAND}" == "null" ]; then + echo "Command Missing: '${TRIGGER_COMMAND}'" continue fi make_cmd "$(jq -c .["$i"].trigger["$j"] "${CONFIG}")" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh