From 8ae1dea012dbd24ef5c0f2436319e50aa86e606f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 5 Jan 2019 23:22:32 -0600 Subject: [PATCH] change git --- mysqlbu-scripts.sh | 2 +- run.sh | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mysqlbu-scripts.sh b/mysqlbu-scripts.sh index aa0f88f..3fdf317 100755 --- a/mysqlbu-scripts.sh +++ b/mysqlbu-scripts.sh @@ -3,7 +3,7 @@ action="$1" FOLDER='/opt/mysqlbu' -VERS='1.01052019' +VERS='1.01062019' source /opt/mysqlbu/settings.conf source /dev/stdin <<< "$(curl -sL https://git.schroedercity.com/voltron/Misc-Scripts/raw/master/colors.inc)" diff --git a/run.sh b/run.sh index 019f7a8..9d399cf 100755 --- a/run.sh +++ b/run.sh @@ -4,16 +4,17 @@ source /opt/mysqlbu/settings.conf cd /opt/mysqlbu #echo "" - -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" +if [ $1 != "backup" ]; 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 + 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 fi ./mysqlbu-scripts.sh $1 $2 exit 0