change git

This commit is contained in:
2019-01-05 23:22:32 -06:00
parent dc84b2da7f
commit 8ae1dea012
2 changed files with 12 additions and 11 deletions

View File

@@ -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)"

21
run.sh
View File

@@ -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