diff --git a/run.sh b/run.sh index b760c09..e3f5b80 100755 --- a/run.sh +++ b/run.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash -# UbUpdate - Ubuntu Update Scripts Loader - source /opt/idssys/defaults/colors.inc -if ([ "${1}" == "" ] || [ "${1}" == "update" ]) && curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then +if ([ "${1}" == "" ] || [ "${1}" == "update" ]) && curl -m 3 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then if [ "${1}" != "check" ]; then echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" @@ -12,6 +10,8 @@ if ([ "${1}" == "" ] || [ "${1}" == "update" ]) && curl -s --head --request GET cd /opt/idssys/defaults if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + echo -en "\e[1A"; + echo -e "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 git reflog expire --expire=now --all >/dev/null 2>&1 @@ -22,21 +22,23 @@ if ([ "${1}" == "" ] || [ "${1}" == "update" ]) && curl -s --head --request GET cd /opt/idssys/vpnmon if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[LightCyan]}Updating VPNMON...${idsCL[Default]}" git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 git reflog expire --expire=now --all >/dev/null 2>&1 git repack -ad >/dev/null 2>&1 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" + else + echo -e "${idsCL[Cyan]}No Updates Available${idsCL[Default]}" fi - - echo -en "\e[1A"; - echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" - echo "" fi +else + /opt/idssys/vpnmon/vpnmon.sh ${1} ${2} ${3} ${4} fi -/opt/idssys/vpnmon/vpnmon.sh $1 $2 $3 $4 - exit 0 diff --git a/vpnmon.sh b/vpnmon.sh index 7ae00ba..05b4f35 100755 --- a/vpnmon.sh +++ b/vpnmon.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash -# powerwall - CLI commands to control VM guest power source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc @@ -95,7 +94,7 @@ CHECK(){ exit 1 fi fi - ((cc=${cc}+1)) + ((cc++)) sleep 1s done