From e93a41c823a19e6fb4d53892a90189c5de18a237 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 29 Nov 2024 14:02:50 -0600 Subject: [PATCH] update --- nodemgmt-scripts.sh | 8 ++++---- run.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 04ec22cb..046a4c60 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -441,18 +441,18 @@ NODEUPDATE(){ ${NCMD} "nodemgmt update q" >> ${tmpfile}.running fi else - echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " >> ${tmpfile}.running + # echo -en " ~ ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " >> ${tmpfile}.running ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1 ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1 echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" >> ${tmpfile}.running fi else - echo -e " ~ ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : Skipping BETA Update" >> ${tmpfile}.running + echo -e "${idsCL[LightCyan]}Skipping BETA Update${idsCL[Default]}" >> ${tmpfile}.running fi elif [ -f ${NM_TMPFOLDER}/${nip}.down ]; then - echo -e " ~ ${idsCL[LightCyan]}Skipping, host is offline${idsCL[Default]}" >> ${tmpfile}.running + echo -e "${idsCL[LightCyan]}Skipping, host is offline${idsCL[Default]}" >> ${tmpfile}.running else - echo -e " ~ ${idsCL[LightCyan]}Skipping${idsCL[Default]}" >> ${tmpfile}.running + echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}" >> ${tmpfile}.running fi [ -f ${tmpfile}.running ] && mv ${tmpfile}.running ${tmpfile}.done || touch ${tmpfile}.done } diff --git a/run.sh b/run.sh index cdf33d35..f4e66f58 100755 --- a/run.sh +++ b/run.sh @@ -10,7 +10,7 @@ source /opt/idssys/nodemgmt/conf/settings.conf source /opt/idssys/nodemgmt/defaults.inc # if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "${1}" != "status" ]; then -if [ "${1}" == "update" ] || [ "${1}" == "update-nodes" ]; then +if [ "${1}" == "update" ] || ([ "${1}" == "update-nodes" ] && [ "${3}" != "sync" ]); then if [ "${1}" == "update-nodes" ]; then echo -e "\n${idsCL[LightGreen]}Updating Node-Manager${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"