From 0ac35ca71d800944d3d5d1896a09f38fc51b1f88 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 11 Feb 2019 12:22:02 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 1ac3ec42..0f74016e 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -578,6 +578,7 @@ NIGHTLYRENEW(){
 }
 
 LISTCERTS(){
+	declare -i cw; declare -i spc1; declare -i c
 	if [ ! -z ${LOCAL_SERVICES+x} ]; then
 		NCMD="ssh root@${PRIMARYHOST}"
 		${NCMD} rm -f /tmp/ssllist
@@ -599,14 +600,15 @@ LISTCERTS(){
 	for certdir in $(</tmp/ssllist); do
 		SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
 		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=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g")
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g")
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g")
-		CERTEXPIRE=$(date -d "$(: | ${NCMD} openssl x509 -in ${certdir}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
+		IFS=', '; SUBJECT_NAMES=(${SUBJECTNAMES}); unset IFS
 		DAYS=14; DUEIN=$(($(date +%s) + (86400*$DAYS)));
 		
-		declare -i cw; declare -i spc1; declare -i c
 		c=0; cw=30; spc=''
 		spc1=${cw}-${#SUBJECT}
 		until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
@@ -615,7 +617,14 @@ LISTCERTS(){
 		else
 			date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
 		fi
-		echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" 
+		if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
+			echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
+		elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then
+			echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date}    ${idsCL[Cyan]}${SUBJECT_NAMES[0]}, ${SUBJECT_NAMES[1]}, ${SUBJECT_NAMES[2]}${idsCL[Default]}"
+			c=0; spc=''; until [ $c = ${cw} ]; do spc="${spc} "; c=`expr $c + 1`; done
+			echo -e "${idsCL[Cyan]}${spc}              ${idsCL[Cyan]}${SUBJECT_NAMES[3]}, ${SUBJECT_NAMES[4]}, ${SUBJECT_NAMES[5]}${idsCL[Default]}"
+			
+		fi
 	done
 	echo 
 	if [ -z $action ] || [ "${action}" = "gui" ]; then