From 25a10a922d583ec228a6ef349557fed84680fe92 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 11 Feb 2019 16:10:09 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index e17a24da..06aa8065 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -530,9 +530,6 @@ CERTRENEW(){
 		if [ "`date +%s`" -gt "$timeout" ]; then
 			echo -e "${idsCL[Red]}Timeout${idsCL[Default]}"
 			timeout=true
-			if [ "${STATUS_CHECK_EMAIL}" != "" ]; then
-				echo "Timeout occurred in waiting for replication between nodes." | mail -s "Status-Check" ${STATUS_CHECK_EMAIL}
-			fi
 			break
 		fi
 	done
@@ -603,7 +600,7 @@ LISTCERTS(){
 	echo 
 	echo -e "${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}"
 	DIVIDER false yellow 100
-	echo -e "Subject Name                      Expires       Alternate Subjects"
+	echo -e "Subject Name                      Expires       Alternate Subject Names"
 	DIVIDER false yellow 100
 	
 	for certdir in $(</tmp/ssllist); do
@@ -611,7 +608,8 @@ LISTCERTS(){
 		SUBJECTNAMES=$(${NCMD} openssl x509 -in ${certdir}cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
 		CERTEXPIRE=$(date -d "$(: | ${NCMD} openssl x509 -in ${certdir}cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
 
-		SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
+		# SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
+		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/\n/, /g")
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g")
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g")
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g")