diff --git a/defaults.inc b/defaults.inc index cfac25ec..808bd806 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.25-11232023' +VERS='4.15.26-11232023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/certs.inc b/inc/certs.inc index 1bbe6559..433034a3 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -86,7 +86,7 @@ NEWCERT(){ fi echo - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi @@ -145,7 +145,7 @@ CERTRENEW(){ SERVICE_MGMT nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}" echo - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi @@ -205,7 +205,7 @@ LISTCERTS(){ rm -f /tmp/ssllist # #for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist # fi - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true fi echo -e "\033[K${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}" @@ -441,7 +441,7 @@ LISTCERTS(){ echo - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi @@ -468,7 +468,7 @@ LISTCERTS_NPM(){ rm -f /tmp/ssllist for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist fi - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true fi echo @@ -516,7 +516,7 @@ LISTCERTS_NPM(){ DIVIDER false darkGray 120 done echo - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi @@ -539,7 +539,7 @@ COPYCERTS_NPM(){ done fi - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true fi @@ -552,7 +552,7 @@ COPYCERTS_NPM(){ fi done - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then echo DIVIDER true ENTER2CONTINUE diff --git a/inc/status.inc b/inc/status.inc index 3f31abb0..53e1c585 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -739,7 +739,7 @@ It was down for $(SHOW_TIME ${toterrtime})" ######################## if [ "${ST_ACTION}" != "check" ]; then echo - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi