From ea04fc996ac54169ec5e4db5fc89abfb09cb51f3 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 3 Dec 2023 21:06:09 -0600 Subject: [PATCH] update --- defaults.inc | 5 +++-- nodemgmt-scripts.sh | 6 ++++++ run.sh | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index b7b1dfa3..a638da9b 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,7 +1,8 @@ #!/usr/bin/env bash -VERS='4.16.30-12032023' +VERS='4.16.31-12032023' +NM_BETA=true -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 ' +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 betacheck ' CERT_DAEMON='/snap/bin/certbot' declare -i errtime diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index a1db358a..a380a0c2 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -774,6 +774,11 @@ SETUPSSH(){ done } +BETACHECK(){ + source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/NodeMgmt/raw/branch/master/defaults.inc)" + [ "${NM_BETA}" == "true" ] && echo true || echo false +} + GUI(){ DISP_HEADER true false @@ -860,6 +865,7 @@ GUI(){ fi ;; setupssh) SETUPSSH ${2} ${3} ${4} ${5} ${6};; + betacheck) BETACHECK;; update-dyndns) UPDATE_DYNDNS ${2} ${3} ${4} ${5} ${6};; backup) BACKUP;; downlist) diff --git a/run.sh b/run.sh index ca184729..b3c1ea45 100755 --- a/run.sh +++ b/run.sh @@ -33,6 +33,7 @@ if [ "${1}" == "update" ]; then cd ${NM_FOLDER} if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then # if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |cut -f1`" ]; then + if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}Updating NodeMgmt...${idsCL[Default]}"