2016-10-18 11:05:48 +00:00
|
|
|
#!/usr/bin/env bash
|
|
|
|
# Pi-hole: A black hole for Internet advertisements
|
|
|
|
# (c) 2015, 2016 by Jacob Salmela
|
|
|
|
# Network-wide ad blocking via your Raspberry Pi
|
|
|
|
# http://pi-hole.net
|
2016-11-01 18:33:04 +00:00
|
|
|
# Check Pi-hole core and admin pages versions and determine what
|
|
|
|
# upgrade (if any) is required. Automatically updates and reinstalls
|
|
|
|
# application if update is detected.
|
2016-10-18 11:05:48 +00:00
|
|
|
#
|
|
|
|
# Pi-hole is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
|
2016-10-18 11:11:02 +00:00
|
|
|
# Variables
|
2016-10-18 13:19:25 +00:00
|
|
|
|
2016-11-02 05:19:40 +00:00
|
|
|
readonly ADMIN_INTERFACE_GIT_URL="https://github.com/pi-hole/AdminLTE.git"
|
|
|
|
readonly ADMIN_INTERFACE_DIR="/var/www/html/admin"
|
|
|
|
readonly PI_HOLE_GIT_URL="https://github.com/pi-hole/pi-hole.git"
|
|
|
|
readonly PI_HOLE_FILES_DIR="/etc/.pihole"
|
2017-02-05 19:07:04 +00:00
|
|
|
|
2017-01-29 01:32:42 +00:00
|
|
|
PH_TEST=true
|
2017-01-29 01:38:14 +00:00
|
|
|
source ${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh
|
2016-10-18 13:19:25 +00:00
|
|
|
|
2017-01-29 01:32:42 +00:00
|
|
|
# is_repo() sourced from basic-install.sh
|
|
|
|
# make_repo() sourced from basic-install.sh
|
|
|
|
# update_repo() source from basic-install.sh
|
|
|
|
# getGitFiles() sourced from basic-install.sh
|
2016-11-02 05:19:40 +00:00
|
|
|
|
2016-12-24 14:19:39 +00:00
|
|
|
GitCheckUpdateAvail() {
|
|
|
|
local directory="${1}"
|
2017-01-29 01:38:14 +00:00
|
|
|
curdir=$PWD
|
2016-12-24 14:19:39 +00:00
|
|
|
cd "${directory}"
|
|
|
|
|
|
|
|
# Fetch latest changes in this repo
|
2016-12-25 00:18:58 +00:00
|
|
|
git fetch --quiet origin
|
2017-01-05 12:10:19 +00:00
|
|
|
|
|
|
|
# @ alone is a shortcut for HEAD. Older versions of git
|
|
|
|
# need @{0}
|
|
|
|
LOCAL="$(git rev-parse @{0})"
|
|
|
|
|
|
|
|
# The suffix @{upstream} to a branchname
|
|
|
|
# (short form <branchname>@{u}) refers
|
|
|
|
# to the branch that the branch specified
|
|
|
|
# by branchname is set to build on top of#
|
|
|
|
# (configured with branch.<name>.remote and
|
|
|
|
# branch.<name>.merge). A missing branchname
|
|
|
|
# defaults to the current one.
|
|
|
|
REMOTE="$(git rev-parse @{upstream})"
|
2016-12-24 14:19:39 +00:00
|
|
|
|
2017-01-05 12:10:19 +00:00
|
|
|
if [[ ${#LOCAL} == 0 ]]; then
|
2017-01-29 01:08:38 +00:00
|
|
|
echo "::: Error: Local revision could not be obtained, ask Pi-hole support."
|
2017-01-05 12:10:19 +00:00
|
|
|
echo "::: Additional debugging output:"
|
|
|
|
git status
|
|
|
|
exit
|
|
|
|
fi
|
|
|
|
if [[ ${#REMOTE} == 0 ]]; then
|
2017-01-29 01:08:38 +00:00
|
|
|
echo "::: Error: Remote revision could not be obtained, ask Pi-hole support."
|
2017-01-05 12:10:19 +00:00
|
|
|
echo "::: Additional debugging output:"
|
|
|
|
git status
|
|
|
|
exit
|
|
|
|
fi
|
|
|
|
|
2017-01-29 01:00:02 +00:00
|
|
|
# Change back to original directory
|
|
|
|
cd "${curdir}"
|
2017-01-05 12:10:19 +00:00
|
|
|
|
|
|
|
if [[ "${LOCAL}" != "${REMOTE}" ]]; then
|
2016-12-24 14:19:39 +00:00
|
|
|
# Local branch is behind remote branch -> Update
|
|
|
|
return 0
|
2016-12-24 14:32:25 +00:00
|
|
|
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
|
2016-12-24 14:19:39 +00:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2016-11-02 08:12:02 +00:00
|
|
|
main() {
|
2016-11-02 18:01:50 +00:00
|
|
|
local pihole_version_current
|
|
|
|
local web_version_current
|
2016-11-02 08:12:02 +00:00
|
|
|
|
2016-12-24 14:19:39 +00:00
|
|
|
#This is unlikely
|
2017-02-05 19:07:04 +00:00
|
|
|
if ! is_repo "${PI_HOLE_FILES_DIR}" ; then
|
|
|
|
echo "::: Critical Error: Core Pi-Hole repo is missing from system!"
|
2016-11-02 19:09:33 +00:00
|
|
|
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
|
|
|
exit 1;
|
|
|
|
fi
|
2016-11-02 08:12:02 +00:00
|
|
|
|
|
|
|
echo "::: Checking for updates..."
|
2016-12-24 14:19:39 +00:00
|
|
|
|
2016-12-24 14:32:25 +00:00
|
|
|
if GitCheckUpdateAvail "${PI_HOLE_FILES_DIR}" ; then
|
|
|
|
core_update=true
|
2016-12-24 14:40:31 +00:00
|
|
|
echo "::: Pi-hole Core: update available"
|
|
|
|
else
|
|
|
|
core_update=false
|
|
|
|
echo "::: Pi-hole Core: up to date"
|
2016-12-24 14:32:25 +00:00
|
|
|
fi
|
|
|
|
|
2017-02-05 19:07:04 +00:00
|
|
|
if [[ ${INSTALL_WEB} == true ]]; then
|
|
|
|
if ! is_repo "${ADMIN_INTERFACE_DIR}" ; then
|
|
|
|
echo "::: Critical Error: Web Admin repo is missing from system!"
|
|
|
|
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
|
|
|
exit 1;
|
|
|
|
fi
|
|
|
|
|
|
|
|
if GitCheckUpdateAvail "${ADMIN_INTERFACE_DIR}" ; then
|
|
|
|
web_update=true
|
|
|
|
echo "::: Web Interface: update available"
|
|
|
|
else
|
|
|
|
web_update=false
|
|
|
|
echo "::: Web Interface: up to date"
|
|
|
|
fi
|
2016-12-24 14:32:25 +00:00
|
|
|
|
2017-02-05 19:12:09 +00:00
|
|
|
# Logic
|
|
|
|
# If Core up to date AND web up to date:
|
|
|
|
# Do nothing
|
|
|
|
# If Core up to date AND web NOT up to date:
|
|
|
|
# Pull web repo
|
|
|
|
# If Core NOT up to date AND web up to date:
|
|
|
|
# pull pihole repo, run install --unattended -- reconfigure
|
|
|
|
# if Core NOT up to date AND web NOT up to date:
|
|
|
|
# pull pihole repo run install --unattended
|
|
|
|
|
|
|
|
if ! ${core_update} && ! ${web_update} ; then
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Everything is up to date!"
|
|
|
|
exit 0
|
|
|
|
|
|
|
|
elif ! ${core_update} && ${web_update} ; then
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Pi-hole Web Admin files out of date"
|
|
|
|
getGitFiles "${ADMIN_INTERFACE_DIR}" "${ADMIN_INTERFACE_GIT_URL}"
|
|
|
|
|
2017-02-07 23:14:41 +00:00
|
|
|
elif ${core_update} && ! ${web_update} ; then
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Pi-hole core files out of date"
|
|
|
|
getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
|
|
|
|
${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --reconfigure --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
|
2017-02-05 19:15:27 +00:00
|
|
|
|
2017-02-07 23:14:41 +00:00
|
|
|
elif ${core_update} && ${web_update} ; then
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Updating Everything"
|
|
|
|
getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
|
|
|
|
${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
|
|
|
|
else
|
|
|
|
echo "*** Update script has malfunctioned, fallthrough reached. Please contact support"
|
|
|
|
exit 1
|
|
|
|
fi
|
2017-02-05 19:15:27 +00:00
|
|
|
else # Web Admin not installed, so only verify if core is up to date
|
2017-02-05 19:12:09 +00:00
|
|
|
if ! ${core_update}; then
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Everything is up to date!"
|
|
|
|
exit 0
|
|
|
|
else
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Pi-hole core files out of date"
|
|
|
|
getGitFiles "${PI_HOLE_FILES_DIR}" "${PI_HOLE_GIT_URL}"
|
2017-02-05 19:39:02 +00:00
|
|
|
${PI_HOLE_FILES_DIR}/automated\ install/basic-install.sh --reconfigure --unattended || echo "Unable to complete update, contact Pi-hole" && exit 1
|
2017-02-05 19:12:09 +00:00
|
|
|
fi
|
2016-11-02 13:41:51 +00:00
|
|
|
fi
|
2016-11-02 14:29:20 +00:00
|
|
|
|
2016-12-24 14:40:31 +00:00
|
|
|
if [[ "${web_update}" == true ]]; then
|
2017-02-05 19:15:27 +00:00
|
|
|
web_version_current="$(/usr/local/bin/pihole version --admin --current)"
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Web Admin version is now at ${web_version_current}"
|
|
|
|
echo "::: If you had made any changes in '/var/www/html/admin/', they have been stashed using 'git stash'"
|
|
|
|
fi
|
2016-11-02 14:29:20 +00:00
|
|
|
|
2017-02-05 19:15:27 +00:00
|
|
|
if [[ "${core_update}" == true ]]; then
|
|
|
|
pihole_version_current="$(/usr/local/bin/pihole version --pihole --current)"
|
|
|
|
echo ":::"
|
|
|
|
echo "::: Pi-hole version is now at ${pihole_version_current}"
|
|
|
|
echo "::: If you had made any changes in '/etc/.pihole/', they have been stashed using 'git stash'"
|
|
|
|
fi
|
2016-11-02 14:29:20 +00:00
|
|
|
|
|
|
|
echo ""
|
|
|
|
exit 0
|
|
|
|
|
2016-11-02 08:12:02 +00:00
|
|
|
}
|
2016-11-02 07:51:38 +00:00
|
|
|
|
2016-11-02 08:12:02 +00:00
|
|
|
main
|