github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-08-14 18:47:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix branchname switching errors

Browse source
This commit is contained in:
Alex Malinovich 2020-04-22 15:14:42 -04:00
commit 9ede6ab548
No known key found for this signature in database
GPG key ID: F3327D1AA93CF5F0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plexupdate.sh
View file

@ -233,13 +233,15 @@ if [ "${AUTOUPDATE}" = "yes" ]; then
else
if [ -z "${BRANCHNAME}" ]; then
BRANCHNAME="$(git symbolic-ref -q --short HEAD)"
elif [ "${BRANCHNAME}" != "$(git symbolic-ref -q --short HEAD)" ]; then
git checkout "${BRANCHNAME}"
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
info "Auto-updating..."
if [ "${BRANCHNAME}" != "$(git symbolic-ref -q --short HEAD)" ]; then
git checkout "${BRANCHNAME}"
fi
# Use an associative array to store permissions. If you're running bash < 4, the declare will fail and we'll
# just run in "dumb" mode without trying to restore permissions
declare -A FILE_OWNER FILE_PERMS && \