From 8bbe104db60c6eda69a8816de4b33b66b9832e57 Mon Sep 17 00:00:00 2001 From: Myve Date: Wed, 28 Aug 2024 07:10:57 +0000 Subject: [PATCH] Unified list-dkim into one sed command --- build/run/bin/list-dkim | 2 +- build/run/docker-entrypoint/init.d/15-opendkimmarc.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/run/bin/list-dkim b/build/run/bin/list-dkim index 040d675..7eaeda2 100755 --- a/build/run/bin/list-dkim +++ b/build/run/bin/list-dkim @@ -6,6 +6,6 @@ do echo -e "\e[3m# Use default._domainkey in the host field" echo -e "# Check with 'opendkim-testkey -d ${domain} -s default'" echo -e "# Or visit https://www.dmarcanalyzer.com/dkim/dkim-checker/\e[0m" - cat ${domain} | sed 's/.*( //' | sed 's/ ).*//' | sed 's/"//g' | sed 's/^[ \t]*//g' | sed ':a;N;$!ba;s/\n//g' + sed -e ':a' -e 'N' -e '$!ba' -e 's/\n//g' -e 's/.*( //' -e 's/ ).*//' -e 's/[ \t]*//g' -e 's/"//g' ${domain} done echo diff --git a/build/run/docker-entrypoint/init.d/15-opendkimmarc.sh b/build/run/docker-entrypoint/init.d/15-opendkimmarc.sh index 4d5a80d..26a9584 100755 --- a/build/run/docker-entrypoint/init.d/15-opendkimmarc.sh +++ b/build/run/docker-entrypoint/init.d/15-opendkimmarc.sh @@ -29,7 +29,7 @@ do echo -e "\e[3m# Use default._domainkey in the host field" echo -e "# Check with 'opendkim-testkey -d ${domain} -s default'" echo -e "# Or visit https://www.dmarcanalyzer.com/dkim/dkim-checker/\e[0m" - cat /etc/opendkim/keys/${domain}/default.txt | sed 's/.*( //' | sed 's/ ).*//' | sed 's/"//g' | sed 's/^[ \t]*//g' | sed ':a;N;$!ba;s/\n//g' + sed -e ':a' -e 'N' -e '$!ba' -e 's/\n//g' -e 's/.*( //' -e 's/ ).*//' -e 's/[ \t]*//g' -e 's/"//g' /etc/opendkim/keys/${domain}/default.txt fi echo done