diff --git a/centmin.sh b/centmin.sh index 89f8c0401..d7cbb4f45 100755 --- a/centmin.sh +++ b/centmin.sh @@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S") branchname='123.09beta01' SCRIPT_MAJORVER='1.2.3' SCRIPT_MINORVER='09' -SCRIPT_INCREMENTVER='590' +SCRIPT_INCREMENTVER='591' SCRIPT_VERSIONSHORT="${branchname}" SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}" SCRIPT_DATE='31/07/2020' diff --git a/tools/emailnotify.sh b/tools/emailnotify.sh index d7ebf758f..4e28d6af6 100755 --- a/tools/emailnotify.sh +++ b/tools/emailnotify.sh @@ -109,12 +109,12 @@ send_ses_mail() { email_date=$(date) SES_FROM_DOMAIN=$(echo "$EMAILNOTIFY_SES_FROM_EMAIL" | awk -F '@' '{print $2}') if [ "$EMAILNOTIFY_SES_CC_EMAIL" ]; then - ses_cc="Cc: $EMAILNOTIFY_SES_CC_EMAIL" + ses_cc="\nCc: $EMAILNOTIFY_SES_CC_EMAIL" else ses_cc= fi if [ "$EMAILNOTIFY_SES_BCC_EMAIL" ]; then - ses_bcc="Bcc: $EMAILNOTIFY_SES_BCC_EMAIL" + ses_bcc="\nBcc: $EMAILNOTIFY_SES_BCC_EMAIL" else ses_bcc= fi @@ -127,9 +127,7 @@ MAIL FROM: ${EMAILNOTIFY_SES_FROM_EMAIL} RCPT TO: ${EMAILNOTIFY_SES_TO_EMAIL} DATA From: $EMAILNOTIFY_SES_FROM_EMAIL <${EMAILNOTIFY_SES_FROM_EMAIL}> -To: ${EMAILNOTIFY_SES_TO_EMAIL} -$ses_cc -$ses_bcc +To: ${EMAILNOTIFY_SES_TO_EMAIL}${ses_cc}${ses_bcc} Subject: $subject $email_date $body