Expand to check web admin versions

This commit is contained in:
Promofaux 2016-09-12 18:57:19 +01:00
parent 0229f70761
commit d124c2c12e

45
pihole
View file

@ -57,20 +57,51 @@ function updatePiholeFunc {
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0) piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//') piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
echo "::: Web Admin version is $webVersion (Latest version is $webVersionLatest)"
if [[ ${piholeVersion} == ${piholeVersionLatest} ]] ; then if [[ ${piholeVersion} == ${piholeVersionLatest} ]] ; then
echo "::: Pi-hole is already up to date! Version: ${piholeVersion}" echo "::: Pi-hole Base files are already up to date! Version: ${piholeVersionLatest}"
echo ":::"
echo "::: No need to update!" echo "::: No need to update!"
else
echo "::: An update is available! Current Version: ${piholeVersion}"
echo "::: Latest Version: ${piholeVersionLatest}"
echo ":::" echo ":::"
echo "::: Fetching latest changes from Github..."
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
echo "::: Web Admin files are already up to date!"
echo "::: No need to update!"
echo ":::"
else
echo "::: An Update is available for the Web Admin!"
echo ":::"
echo "::: Fetching latest changes from GitHub..."
cd /var/www/html/admin
${SUDO} git pull origin master
echo ":::"
echo "::: Pi-hole Web Admin has been updated to ${webVersion}"
echo "::: See https://changes.pi-hole.net for details"
fi
else
echo -n "::: An update is available for "
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
echo " Pi-Hole!"
else
echo " Pi-Hole base files and the Web Admin. Both will be updated!"
fi
echo "::: Fetching latest changes from GitHub..."
cd /etc/.pihole cd /etc/.pihole
${SUDO} git pull origin master ${SUDO} git pull origin master
${SUDO} /etc/.pihole/automated\ install/basic-install.sh pihole ${SUDO} /etc/.pihole/automated\ install/basic-install.sh pihole
echo ":::" echo ":::"
echo "::: Pi-hole has been updated, see https://changes.pi-hole.net for details" echo "::: Pi-hole has been updated to version ${piholeVersionLatest}"
if [[ ${webVersion} != ${webVersionLatest} ]] ; then
echo "::: Web Admin has been updated to version ${webVersionLatest}"
fi
echo ":::"
echo "::: See https://changes.pi-hole.net for details"
fi fi
exit 1 exit 1