diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 6fcd990f..af51847e 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -317,6 +317,7 @@ KEEPALIVE-CONFIG() { NODEUPDATE() { start=`date +%s` + cw=40; if [ "${1}" = "report" ]; then unset idsCL idsBG idsST idsCL=('') @@ -325,14 +326,14 @@ NODEUPDATE() { else echo fi - declare -i cw; declare -i spc1; declare -i c + declare -i spc1; declare -i c echo -e "${idsCL[LightGreen]}Updating All Nodes${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" [ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq root@${NM_NODEMANAGER}" if [ "${2}" != "sync" ]; then - c=0; cw=24; spca=''; spc1=${cw}-7; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done + c=0; spca=''; spc1=${cw}-7; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca} ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " ${NMCMD} "nodemgmt update q" @@ -352,7 +353,7 @@ NODEUPDATE() { fi NCMD="ssh -tq root@${nip}" NODE=${NM_HOSTNAMES[${nip}]}[${nip}] - c=0; cw=40; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done + c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done echo -en "Updating ${NODE}${spca}" if [ "${2}" != "sync" ]; then @@ -932,7 +933,7 @@ GUI(){ listcerts-npm) LISTCERTS_NPM;; copynpmcerts) COPYCERTS_NPM ${2};; checknpmcerts) CHECK_NPMCERTS;; - checkcerts) CHECK-CERTS ${2};; + checkcerts) CHECK-CERTS ${2} ${3} ${4} ${5} ${6};; nightlyrenew) mv -f ${NM_LOGFOLDER}/cert-renewal1.lastrun ${NM_LOGFOLDER}/cert-renewal2.lastrun >/dev/null 2>&1 mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1