diff --git a/install.sh b/install.sh index 763dff40..5daaa262 100755 --- a/install.sh +++ b/install.sh @@ -8,19 +8,19 @@ source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)" echo echo -e "${idsCL[LightGreen]}NodeMgmt Installation Script${idsCL[Default]}" -do_with_root $APTFUNC -y install wget curl git +$APTFUNC -y install wget curl git -do_with_root set -eu -do_with_root git clone https://git.schroedercity.com/voltron/NodeMgmt.git /opt/idssys/nodemgmt -do_with_root ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nodemgmt +set -eu +git clone https://git.schroedercity.com/voltron/NodeMgmt.git /opt/idssys/nodemgmt +ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nodemgmt if [ ! -d "/opt/idssys/defaults" ]; then - do_with_root set -eu - do_with_root git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults + set -eu + git clone https://git.schroedercity.com/voltron/iDS-Defaults.git /opt/idssys/defaults fi if [ ! -d "/opt/idssys/settings" ]; then - do_with_root mkdir /opt/idssys/settings + mkdir /opt/idssys/settings fi echo -e "NODE_HOSTNAME=\"$(hostname)\" #LOCAL_SERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale diff --git a/run.sh b/run.sh index 5ceb98c7..78c4e7db 100755 --- a/run.sh +++ b/run.sh @@ -66,5 +66,10 @@ if [ "${1}" == "update" ]; then echo -e "${idsCL[Red]}Could not connect to 'git.schroedercity.com' for updates${idsCL[Default]}" fi fi + +[ ! -f /usr/local/bin/nmg ] && ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/nmg +[ ! -f /usr/local/bin/ndmg ] && ln -s /opt/idssys/nodemgmt/run.sh /usr/local/bin/ndmg + ${NM_SCRIPT} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15} ${16} ${17} ${18} ${19} ${20} ${21} ${22} ${23} ${24} ${25} + exit 0