github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-08-20 13:23:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix indentation in cronwrapper

Browse source
This commit is contained in:
Alex Malinovich 2016-11-30 17:03:09 -08:00
commit 9140e26f0a
2 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plexupdate.sh
View file

@ -334,6 +334,7 @@ if [ "${AUTOUPDATE}" = "yes" ]; then
exit 1 exit 1
fi fi
# Force FETCH_HEAD to point to the correct branch (for older versions of git which don't default to current branch)
if git fetch origin $BRANCHNAME --quiet && ! git diff --quiet FETCH_HEAD; then if git fetch origin $BRANCHNAME --quiet && ! git diff --quiet FETCH_HEAD; then
info "Auto-updating..." info "Auto-updating..."
if ! git merge --quiet FETCH_HEAD; then if ! git merge --quiet FETCH_HEAD; then