diff --git a/run.sh b/run.sh index c0f100f5..28f5456a 100755 --- a/run.sh +++ b/run.sh @@ -6,12 +6,10 @@ source /opt/idssys/powerwall/powerwall.conf source /opt/idssys/defaults/colors.inc if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then - if [ "${1}" != "powerwall" ]; then + if [ "${1}" == "update" ]; then echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}" echo "" - fi - if [ "${1}" != "powerwall" ]; then 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 @@ -21,10 +19,8 @@ if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 20 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 fi - fi - cd /opt/idssys/powerwall - - if [ "$1" != "update" ] && [ "$1" != "up" ]; then + + 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 git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 @@ -33,15 +29,14 @@ if curl -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 20 git prune >/dev/null 2>&1 git pull >/dev/null 2>&1 fi - fi - if [ "${1}" != "powerwall" ]; then + echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" echo "" fi fi -if [ "${1}" != "powerwall" ]; then +if [ "${1}" != "update" ]; then /opt/idssys/powerwall/powerwall.sh $1 $2 $3 $4 fi