From 41680d8a540e1c4021d584bfbf88a3f900f9fd3f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 28 Jan 2019 18:12:41 -0600 Subject: [PATCH] Update run.sh --- run.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index d1f7ef2..c767c73 100755 --- a/run.sh +++ b/run.sh @@ -2,9 +2,22 @@ # UbUpdate - Ubuntu Update Scripts Loader source /opt/idssys/LinUPx/settings.conf +source /opt/idssys/defaults/colors.inc +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 + #echo "" + #echo -e "\e[92m\e[1mLinUPx update completed\e[0m" +fi cd /opt/idssys/LinUPx -#echo "" if [ "$1" != "update" ] && [ "$1" != "up" ]; then 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 @@ -16,6 +29,9 @@ if [ "$1" != "update" ] && [ "$1" != "up" ]; then fi fi -/opt/idssys/LinUpx/linupx-scripts.sh $1 $2 +echo -en "\e[1A"; +echo -e "\e[0K\r ${idsCL[Green]}Updates Completed${idsCL[Default]}" +echo "" +/opt/idssys/LinUPx/linupx-scripts.sh $1 $2 $3 $4 exit 0