Update run.sh

This commit is contained in:
2019-01-05 11:43:07 -06:00
parent 7e00047d0c
commit a600c2ac3f

7
run.sh
View File

@@ -3,15 +3,13 @@
source /opt/mysqlbu/settings.conf source /opt/mysqlbu/settings.conf
cd /opt/LinUPx cd /opt/mysqlbu
echo "" echo ""
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" = "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" = "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then
echo -e "\e[92m\e[1mUp to date\e[0m" echo -e "\e[92m\e[1mUp to date\e[0m"
else else
echo -e "\e[93m\e[1mnot up to date\e[21m, updating now...\e[0m" echo -e "\e[93m\e[1mnot up to date\e[21m, updating now...\e[0m"
sleep 1
# git -c http.sslVerify=false pull # git -c http.sslVerify=false pull
git fetch origin master git fetch origin master
git reset --hard origin/master git reset --hard origin/master
@@ -25,7 +23,6 @@ else
echo -e "\e[92m\e[1mLinUPx update completed\e[0m" echo -e "\e[92m\e[1mLinUPx update completed\e[0m"
fi fi
sleep 1 ./mysqlbu-scripts.sh $1 $2
./linupx-scripts.sh $1 $2
exit 0 exit 0