From 50438c191a236918e4e923d8fcc8fd55c9b10e57 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 13 Oct 2018 16:41:49 -0500 Subject: [PATCH] Update run.sh --- run.sh | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/run.sh b/run.sh index d9cef3d..7fcdce1 100755 --- a/run.sh +++ b/run.sh @@ -3,22 +3,19 @@ cd /opt/LinUPx echo "" -#if [ -z "$1" ]; 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" - sleep 1 - ./linupx-scripts.sh $1 - else - echo -e "\e[93m\e[1mnot up to date\e[21m, updating now...\e[0m" - sleep 1 - # git -c http.sslVerify=false pull - git pull - echo "" - echo -e "\e[92m\e[1mupdate completed\e[0m" - sleep 1 - ./linupx-scripts.sh $1 - fi -#else -# ./linupx-scripts.sh $1 -#fi + +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" +else + echo -e "\e[93m\e[1mnot up to date\e[21m, updating now...\e[0m" + sleep 1 + # git -c http.sslVerify=false pull + git pull + echo "" + echo -e "\e[92m\e[1mupdate completed\e[0m" +fi + +sleep 1 +./linupx-scripts.sh $1 + exit 0 \ No newline at end of file