diff --git a/dsmon.sh b/dsmon.sh index 731dd41..5e060c0 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -7,6 +7,8 @@ source /opt/idssys/dsmon/config.settings.inc action="$1" +VERS=2.2.1-07042023 + RUN(){ if [ "${SERVERMON_ID}" != "" ]; then diff --git a/run.sh b/run.sh index b6988ff..45678af 100755 --- a/run.sh +++ b/run.sh @@ -20,7 +20,7 @@ if [ "${1}" == "update" ]; then 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"; - echo -e "\e[0K\r ${idsCL[LightCyan]}Installing defaults updates...${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" fi git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 @@ -34,7 +34,7 @@ if [ "${1}" == "update" ]; then 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"; - echo -e "\e[0K\r ${idsCL[LightCyan]}Installing dsmon updates...${idsCL[Default]}" + echo -e "\e[0K\r ${idsCL[LightCyan]}Updating DSMon...${idsCL[Default]}" fi git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 @@ -44,9 +44,10 @@ if [ "${1}" == "update" ]; then git pull >/dev/null 2>&1 git submodule update --remote >/dev/null 2>&1 /bin/chmod +x /opt/idssys/nodemgmt/nodemgmt-scripts.sh 2>&1 + source /opt/idssys/dsmon/dsmon.sh if [ "${2}" != "q" ]; then echo -en "\e[1A"; - echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" + echo -e "\e[0K\r ${idsCL[Green]}Updated to v${VERS}${idsCL[Default]}" fi elif [ "${2}" != "q" ]; then echo -en "\e[1A";