voltron/LinUPx
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Update run.sh

Browse Source
This commit is contained in:
David Schroeder
2019-01-05 23:55:49 -06:00
parent ee355c8352
commit 6fcfac78cd
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
run.sh
View File

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