voltron/dsmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2023-07-04 21:31:03 -05:00
parent 2be1fa9bd9
commit 5e35d373e9
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
run.sh
View File

@@ -2,8 +2,8 @@
source /opt/idssys/defaults/colors.inc
source /opt/idssys/defaults/default.inc
source /opt/idssys/dsmon/config.settings.inc
source /opt/idssys/dsmon/defaults.inc
source ${DS_FOLDER}/config.settings.inc
source ${DS_FOLDER}/defaults.inc
if [ "${1}" == "update" ]; then
@@ -31,7 +31,7 @@ if [ "${1}" == "update" ]; then
git pull >/dev/null 2>&1
git submodule update --remote >/dev/null 2>&1
fi
cd /opt/idssys/dsmon
cd ${DS_FOLDER}
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
if [ "${2}" != "q" ]; then
echo -en "\e[1A";
@@ -44,8 +44,8 @@ if [ "${1}" == "update" ]; then
git prune >/dev/null 2>&1
git pull >/dev/null 2>&1
git submodule update --remote >/dev/null 2>&1
/bin/chmod +x /opt/idssys/dsmon/dsmon.sh 2>&1
source /opt/idssys/dsmon/defaults.inc
/bin/chmod +x ${DS_FOLDER}/dsmon.sh 2>&1
source ${DS_FOLDER}/defaults.inc
if [ "${2}" != "q" ]; then
echo -en "\e[1A";
echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}"
@@ -59,7 +59,7 @@ if [ "${1}" == "update" ]; then
fi
fi
/opt/idssys/dsmon/dsmon.sh "$1" "$2" $3 $4
${DS_FOLDER}/dsmon.sh "$1" "$2" $3 $4
exit 0