From f0a41006c094cdb5a7c32457cc08a588a2e07c30 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Mon, 24 Jun 2024 11:49:05 +0200 Subject: [PATCH] fix: dev: [cron] correct invalid usage of ``pipefail`` --- cron/hooks/pre_deploy | 2 +- cron/test/entries_from_service | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cron/hooks/pre_deploy b/cron/hooks/pre_deploy index 7ab8a90..9e8d0a2 100755 --- a/cron/hooks/pre_deploy +++ b/cron/hooks/pre_deploy @@ -6,7 +6,7 @@ set -e root_crontab="$SERVICE_CONFIGSTORE/etc/crontabs/root" -cron_content=$(set pipefail; cron:entries | tr '\0' '\n') || { +cron_content=$(set -o pipefail; cron:entries | tr '\0' '\n') || { err "Failed to make cron entries" >&2 exit 1 } diff --git a/cron/test/entries_from_service b/cron/test/entries_from_service index cb99b5d..739b5db 100644 --- a/cron/test/entries_from_service +++ b/cron/test/entries_from_service @@ -108,7 +108,7 @@ is out '' TRIM try " -set pipefail && +set -o pipefail && cron:entries_from_service 'foo' ' (0 0 * * *) {-p 10 -k} dc run --rm foo ' | tr '\0' '\n'" "one command no label" @@ -119,7 +119,7 @@ is out "\ try " -set pipefail && +set -o pipefail && cron:entries_from_service 'foo' ' wiz: (0 0 * * *) {-p 10 -k} dc run --rm foo ' | tr '\0' '\n'" "one command with label" @@ -131,7 +131,7 @@ is out "\ try " -set pipefail && +set -o pipefail && cron:entries_from_service 'foo' ' wiz: (0 0 * * *) {-p 10 -k} dc run --rm foo bam: (@daily) {-p 10 -D -k} dc run --rm foo --hop @@ -146,7 +146,7 @@ is out "\ try " -set pipefail && +set -o pipefail && cron:entries_from_service 'foo' '!var-expand (0 0 * * *) {-p 10 -k} dc run --rm \$BASE_SERVICE_NAME \$MASTER_BASE_SERVICE_NAME ' | tr '\0' '\n'" "using relation's var"