From 72959683947959639d212b2ef45620a9f46b17f3 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 10 Feb 2019 16:58:36 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index fc72ccf4..5e43766d 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -592,6 +592,21 @@ LISTCERTS(){
 		SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g")
 		CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certdir}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s'); 
 		DAYS=14; DUEIN=$(($(date +%s) + (86400*$DAYS)));
+		
+		AWK=$(which awk)
+		DATE=$(which date)
+		GREP=$(which grep)
+		OPENSSL=$(which openssl)
+		SED=$(which sed)
+
+		
+        CERTDATE=$(${OPENSSL} x509 -in ${certdir}/cert.pem -text -enddate -noout -inform pem | grep 'Not After')
+        COMMONNAME=$(${OPENSSL} x509 -in ${certdir}/cert.pem -text -subject -noout -inform pem | \
+                   ${SED} -e 's/.*CN=//' | \
+                   ${SED} -e 's/\/.*//')
+					   
+		SUBJECT=${COMMONNAME}
+
 
 		declare -i cw; declare -i spc1; declare -i c
 		c=0; cw=30; spc=''
@@ -602,7 +617,7 @@ 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]}" 
+		echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${CERTDATE}    ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" 
 	done
 	echo 
 	if [ -z $action ] || [ "${action}" = "gui" ]; then