From 9389febd5829fd018b7e30aa8c78068560e513aa Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 15 May 2023 20:16:31 -0500 Subject: [PATCH] Update run.sh --- run.sh | 56 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/run.sh b/run.sh index f1e7afb..800c8d5 100755 --- a/run.sh +++ b/run.sh @@ -10,32 +10,36 @@ source /opt/idssys/defaults/default.inc source /opt/idssys/mysqlbu/settings.conf #if [ "$1" != "backup" ]; then -if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; 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 - 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 +if [ "${1}" == "update" ]; then + if curl -m 5 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; 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 + 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/mysqlbu + if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + 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 "" + #echo -e "\e[92m\e[1mLinUPx update completed\e[0m" + fi + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" + echo "" fi - cd /opt/idssys/mysqlbu - if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then - 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 "" - #echo -e "\e[92m\e[1mLinUPx update completed\e[0m" - fi - echo -en "\e[1A"; - echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" - echo "" +else + /opt/idssys/mysqlbu/mysqlbu-scripts.sh $1 $2 $3 $4 fi -/opt/idssys/mysqlbu/mysqlbu-scripts.sh $1 $2 $3 $4 + exit 0