From 6be18c0df72f4c4cdb8a72c3b53a44cc5316df7a Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sat, 11 Nov 2023 10:35:47 +0000
Subject: [PATCH] Warn rather than sanitize

---
 root/etc/s6-overlay/s6-rc.d/init-envfile/run | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-envfile/run b/root/etc/s6-overlay/s6-rc.d/init-envfile/run
index 6c1e524..cc1b62e 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-envfile/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-envfile/run
@@ -6,11 +6,11 @@ if find /run/s6/container_environment/FILE__* -maxdepth 1 > /dev/null 2>&1; then
             SECRETFILE=$(cat "${FILENAME}")
             if [[ -f ${SECRETFILE} ]]; then
                 FILESTRIP=${FILENAME//FILE__/}
-                if [[ ${SECRET_NO_SANITIZE,,} = "true" ]]; then
-                    cat "${SECRETFILE}" >"${FILESTRIP}"
-                else
-                    tr -d '\n' < "${SECRETFILE}" >"${FILESTRIP}"
+                if [[ $(tail -n1 "${SECRETFILE}" | wc -l) = 1 ]]; then
+                    echo "[env-init] Your secret: ${FILENAME##*/}"
+                    echo "           contains a trailing newline and may not work as expected"
                 fi
+                cat "${SECRETFILE}" >"${FILESTRIP}"
                 echo "[env-init] ${FILESTRIP##*/} set from ${FILENAME##*/}"
             else
                 echo "[env-init] cannot find secret in ${FILENAME##*/}"