diff --git a/run.sh b/run.sh index ef1b6fa..57b1f42 100755 --- a/run.sh +++ b/run.sh @@ -3,40 +3,35 @@ source /opt/idssys/defaults/colors.inc 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]}" - echo "" - - 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 - git repack -ad >/dev/null 2>&1 - git prune >/dev/null 2>&1 - git pull >/dev/null 2>&1 - fi - - 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 "\e[1A\e[0K\r${idsCL[Cyan]}No Updates Available${idsCL[Default]}" - fi - + echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}\n" + 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 + git repack -ad >/dev/null 2>&1 + git prune >/dev/null 2>&1 + git pull >/dev/null 2>&1 fi + + 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 "\e[1A\e[0K\r${idsCL[Cyan]}No Updates Available${idsCL[Default]}" + fi + echo else /opt/idssys/vpnmon/vpnmon.sh ${1} ${2} ${3} ${4} fi