From ccd1e35c0812075fcfc9fcf7569b8b64c453682f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 22 Feb 2025 15:18:47 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index d7a490bd..b2148c4b 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -361,7 +361,7 @@ NODEUPDATES() { if [ ! -f /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running ]; then if [ "${RUN_NODE_IP}" != "${nip}" ]; then touch /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running - NODEUPDATE "${nip}" "${2}" "${NMCMD}" & + NODEUPDATE "${nip}" "${2}" "${NMCMD}" /dev/null; then - ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1 - ${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 + if ! ${NCMD} command -v nodemgmt < /dev/null; then + ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" &1 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 sleep 2s - [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1 + [ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" &1 echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running elif [ ${noup} -eq 1 ]; then echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running @@ -431,8 +431,8 @@ NODEUPDATE(){ ${NCMD} "nodemgmt update q" >> ${tmpfile}.running fi else - ${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 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & &1 + ${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ &1 echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}" >> ${tmpfile}.running fi else