From ada620577634e443b91ad2557a68330cec465a4c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 27 Jan 2019 15:30:27 -0600 Subject: [PATCH] folder change --- nodemgmt-scripts.sh | 7 +++---- run.sh | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 2fa46e82..2d779415 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -2,13 +2,12 @@ # MySQL-BU - MySQL Backup Scripts action="$1" -FOLDER='/opt/nodemgmt' VERS='1.01272019' CERT_DAEMON='/usr/bin/certbot' -source ${folder}/settings.conf -source ${folder}/ids-defaults/colors.conf -source ${folder}/ids-defaults/default.conf +source /opt/idssys/nodemgmt/settings.conf +source /opt/idssys/defaults/colors.conf +source /opt/idssys/defaults/default.conf # ========================================================= # diff --git a/run.sh b/run.sh index 9fc03528..3446b9ca 100755 --- a/run.sh +++ b/run.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -# MySQL-BU Loader +# NodeMgmt Loader -source /opt/nodemgmt/settings.conf -cd /opt/nodemgmt +source /opt/idssys/nodemgmt/settings.conf +cd /opt/idssys/nodemgmt #echo "" if [ "$1" != "backup" ]; then if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then @@ -15,7 +15,6 @@ if [ "$1" != "backup" ]; then #echo "" #echo -e "\e[92m\e[1mLinUPx update completed\e[0m" fi - git submodule foreach git pull origin master fi ./nodemgmt-scripts.sh $1 $2 exit 0