arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-12 10:49:04 +00:00
Code Issues Releases Wiki Activity

Use new subroutine to determine if updates are available

Browse Source
This commit is contained in:
DL6ER 2016-12-24 15:32:25 +01:00
parent c449a1c0e0
commit 65c35a5530
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
advanced/Scripts/update.sh
View File

@ -86,14 +86,17 @@ GitCheckUpdateAvail() {
git fetch origin git fetch origin
status="$(git status -sb)" status="$(git status -sb)"
# Change back to original directory
cd "${curdir}" cd "${curdir}"
if [[ $status == *"behind"* ]]; then if [[ $status == *"behind"* ]]; then
# Local branch is behind remote branch -> Update # Local branch is behind remote branch -> Update
return 1
else
# Local branch is up-to-date
return 0 return 0
else
# Local branch is up-to-date or in a situation
# where this updater cannot be used (like on a
# branch that exists only locally)
return 1
fi fi
} }
@ -112,7 +115,18 @@ main() {
echo "::: Checking for updates..." echo "::: Checking for updates..."
if GitCheckUpdateAvail "${PI_HOLE_FILES_DIR}" ; then
core_update=true
echo "Pi-hole Core update available"
fi
if GitCheckUpdateAvail "${ADMIN_INTERFACE_DIR}" ; then
web_update=true
echo "Web Interface update available"
fi
exit
# Logic # Logic
# If latest versions are blank - we've probably hit Github rate limit (stop running `pihole -up so often!): # If latest versions are blank - we've probably hit Github rate limit (stop running `pihole -up so often!):