From d2aa4838fe456bade1218051d5fc7c0ab1c55de3 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Sep 2022 16:03:25 -0500 Subject: [PATCH] Update run.sh --- run.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/run.sh b/run.sh index f94d1974..03025952 100755 --- a/run.sh +++ b/run.sh @@ -1,11 +1,60 @@ #!/usr/bin/env bash -# UbUpdate - Ubuntu Update Scripts Loader +# PowerWall Management Loader - -source /opt/idssys/powerwall/powerwall.conf source /opt/idssys/defaults/colors.inc +source /opt/idssys/defaults/default.inc +source /opt/idssys/powerwall/powerwall.conf + +if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]]; then + # if [ "${1}" = "gui" ]; then + # DISP_HEADER + # fi + + # if [ "${1}" != "guiX" ]; then + if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then + if [ "${2}" != "q" ]; then + echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" + echo "" + fi + 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 + if [ "${2}" != "q" ]; then + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[LightCyan]}Installing updates...${idsCL[Default]}" + fi + 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 + git submodule update --remote >/dev/null 2>&1 + fi + cd /opt/idssys/powerwall + 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 updates...${idsCL[Default]}" + fi + 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 + git submodule update --remote >/dev/null 2>&1 + /bin/chmod +x /opt/idssys/powerwall/powerwall.sh 2>&1 + if [ "${2}" != "q" ]; then + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" + fi + elif [ "${2}" != "q" ]; then + echo -en "\e[1A"; + echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}" + fi + fi +fi /opt/idssys/powerwall/powerwall.sh $1 $2 $3 $4 - exit 0