From e62c842795b1de0cddc8c67fc58c7612bac48890 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 23 Aug 2022 01:04:28 +0100
Subject: [PATCH] Handle embedded new lines differently in cron scripts.

---
 base-files/cron.daily/warn-git-status | 2 +-
 base-files/cron.daily/warn-smtp-queue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base-files/cron.daily/warn-git-status b/base-files/cron.daily/warn-git-status
index a91e7fc..1688d66 100755
--- a/base-files/cron.daily/warn-git-status
+++ b/base-files/cron.daily/warn-git-status
@@ -7,4 +7,4 @@ TEMPLATESTATUS="$(cd /etc/slackpkg/templates && git status | egrep -ve "^(On bra
 
 [[ -z "$ETCSTATUS" ]] && [[ -z "$TEMPLATESTATUS" ]] && exit 0
 
-mailx "${MAILX_ARGS[@]}" -r "$EMAIL_FROM" -s "/etc git status" "${EMAIL_TO[@]}" <<< "${ETCSTATUS:+$ETCSTATUS$'\n\n'}$TEMPLATESTATUS"
+mailx "${MAILX_ARGS[@]}" -r "$EMAIL_FROM" -s "/etc git status" "${EMAIL_TO[@]}" <<<"${ETCSTATUS:+$ETCSTATUS$'\n'$'\n'}$TEMPLATESTATUS"
diff --git a/base-files/cron.daily/warn-smtp-queue b/base-files/cron.daily/warn-smtp-queue
index 1eb491f..6ecd8db 100755
--- a/base-files/cron.daily/warn-smtp-queue
+++ b/base-files/cron.daily/warn-smtp-queue
@@ -10,4 +10,4 @@ QUEUE="$(mailq)"
 
 [[ -z "$QUEUE" ]] && exit 0
 
-mailx "${MAILX_ARGS[@]}" -r "$EMAIL_FROM" -s "Mail queue" "${EMAIL_TO[@]}" <<< "$QUEUE"
+mailx "${MAILX_ARGS[@]}" -r "$EMAIL_FROM" -s "Mail queue" "${EMAIL_TO[@]}" <<<"$QUEUE"