diff --git a/inc/certs.inc b/inc/certs.inc index d4829b58..612ed315 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -270,10 +270,6 @@ LISTCERTS(){ i=`expr $i + 1` done - for c in ${!CERTLIST[@]}; do - echo "HERE: ${c}=${CERTLIST[${c}]}" - done - if [ ${EDIT} -eq 1 ]; then echo DIVIDER . yellow ${dl} @@ -284,7 +280,6 @@ LISTCERTS(){ trap exitspacing EXIT while [ "${editc^}" != "E" ]; do - echo "C HERE: ${certid}" unset certid echo -e "\033[K" echo -e "\033[K" @@ -306,6 +301,7 @@ LISTCERTS(){ exit 0 elif [ "${certid}" != "" ] && [ "${CERTLIST[${certid}]}" != "" ]; then + ecbo "HERE: ${certid} = '${CERTLIST[${certid}]}'" cert=${CERTLIST[${certid}]} certdir=${NM_CERTPATH}/live/${cert} SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV) diff --git a/inc/sites.inc b/inc/sites.inc index 4111e32a..dc537528 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -809,7 +809,7 @@ SITEINFO(){ else lock='-' fi - f=0; editc=0 + editc=0 until [ "${editc^}" = "C" ]; do echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}" echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${type}${idsST[Reset]}" @@ -862,7 +862,7 @@ SITEINFO(){ ;; 7) echo -e "\033[K\n\033[K" echo -en "\033[KEnter new Proxy Address: " - read -i "${server}" -e server + read -i "${server}" -e server echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" ;; 8) [ "${scheme}" == "http" ] && scheme='https' || scheme='http';; @@ -916,7 +916,6 @@ SITEINFO(){ esac fi - f=1 done else #no site echo -e "\033[3A"; for (( c=1; c<=3; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[4A"