From 6fcfac78cd7803ba44967574a2920051d80b92fd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 5 Jan 2019 23:55:49 -0600 Subject: [PATCH] Update run.sh --- run.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/run.sh b/run.sh index cb4a327..23059ca 100755 --- a/run.sh +++ b/run.sh @@ -6,8 +6,7 @@ source /opt/LinUPx/settings.conf cd /opt/LinUPx #echo "" -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 +if [ $1 != "update" ] && [ "`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 @@ -19,7 +18,6 @@ if [ "${1}" != "update" ]; then fi fi -sleep 10 -./linupx-scripts.sh $1 $2 +#./linupx-scripts.sh $1 $2 exit 0