From ad4d4cc7947e3e5a72cc43379c349b0799310bf4 Mon Sep 17 00:00:00 2001 From: Brandon Schmitt Date: Fri, 11 Dec 2020 04:51:53 +0100 Subject: [PATCH] Refactor bash [[ ... ]] && ... || ... into if then else --- target/start-mailserver.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh index 293208b9..57e5b13d 100755 --- a/target/start-mailserver.sh +++ b/target/start-mailserver.sh @@ -1095,7 +1095,16 @@ function _setup_ssl local LETSENCRYPT_DOMAIN="" local LETSENCRYPT_KEY="" - [[ -f /etc/letsencrypt/acme.json ]] && (_extract_certs_from_acme "${SSL_DOMAIN}" || _extract_certs_from_acme "${HOSTNAME}" || _extract_certs_from_acme "${DOMAINNAME}") + if [[ -f /etc/letsencrypt/acme.json ]] + then + if ! _extract_certs_from_acme "${SSL_DOMAIN}" + then + if ! _extract_certs_from_acme "${HOSTNAME}" + then + _extract_certs_from_acme "${DOMAINNAME}" + fi + fi + fi # first determine the letsencrypt domain by checking both the full hostname or just the domainname if a SAN is used in the cert if [[ -e /etc/letsencrypt/live/${HOSTNAME}/fullchain.pem ]]