From 60662733c39cf68016b76ce4279f95b502ffaf39 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 30 Jan 2019 01:35:21 -0600 Subject: [PATCH] Update run.sh --- run.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/run.sh b/run.sh index d9ba61f..cdf851f 100755 --- a/run.sh +++ b/run.sh @@ -1,14 +1,26 @@ #!/usr/bin/env bash # MySQL-BU Loader + +source /opt/idssys/defaults/colors.inc +source /opt/idssys/defaults/default.inc if [ ! -f /opt/idssys/settings/mysqlbu.conf ]; then source /opt/idssys/mysqlbu/settings.conf else source /opt/idssys/settings/mysqlbu.conf fi - -cd /opt/idssys/mysqlbu -#echo "" if [ "$1" != "backup22" ]; 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 @@ -19,6 +31,9 @@ if [ "$1" != "backup22" ]; then #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 ./mysqlbu-scripts.sh $1 $2 $3 $4 exit 0