From 638278a78050f49ef7ebe6bf0de4462715c052ad Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 5 Jan 2019 23:58:10 -0600 Subject: [PATCH] Update run.sh --- run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index d675c3e..0bfc0b6 100755 --- a/run.sh +++ b/run.sh @@ -6,7 +6,8 @@ source /opt/LinUPx/settings.conf cd /opt/LinUPx #echo "" -if [ "$1" != "update" ] && [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then +if [ "$1" != "update" ]; 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