voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-03 23:09:40 -06:00
parent 0fd8eb07fa
commit bec73d745c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.16.35-12032023' VERS='4.16.36-12032023'
NM_BETA=true NM_BETA=false
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 ' 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' CERT_DAEMON='/snap/bin/certbot'

2
nodemgmt-scripts.sh
View File

@@ -335,7 +335,7 @@ NODEUPDATES() {
if [ "${2}" != "sync" ]; then if [ "${2}" != "sync" ]; then
c=0; spca=''; spc1=${cw}-25; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done c=0; spca=''; spc1=${cw}-25; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca} ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " echo -en "Updating Node-Manager[${NM_NODEMANAGER}]${spca} ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
${NMCMD} "nodemgmt update q" if [ "$(${NM_SCRIPT} betacheck)" == "false" ] && ${NMCMD} "nodemgmt update q" || echo -e "Skipping BETA Update"
fi fi
echo echo

5
run.sh
View File

@@ -34,14 +34,15 @@ if [ "${1}" == "update" ]; then
# if [ "`git log --pretty=%H ...refs/heads/dev^ | head -n 1`" != "`git ls-remote origin -h refs/heads/dev |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 [ "`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/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
goforup=0 goforup=0
if [ "$(${NM_SCRIPT} betacheck)" == "true" ] && [ "${2}" != "q" ]; then betacheck=$(${NM_SCRIPT} betacheck)
if [ "${betacheck}" == "true" ] && [ "${2}" != "q" ]; then
echo -en "\e[1A"; echo -en "\e[1A";
echo -en "\e[0K\r${idsCL[LightCyan]}This update is currently in BETA, proceed (N/y)? ${idsCL[Default]}" echo -en "\e[0K\r${idsCL[LightCyan]}This update is currently in BETA, proceed (N/y)? ${idsCL[Default]}"
read -n1 choice read -n1 choice
case $choice in case $choice in
[Yy]) echo; goforup=1;; [Yy]) echo; goforup=1;;
esac esac
elif [ "$(${NM_SCRIPT} betacheck)" == "true" ] && [ "${2}" == "q" ]; then elif [ "${betacheck}" == "true" ] && [ "${2}" == "q" ]; then
goforup=0 goforup=0
else else
goforup=1 goforup=1