From 3d43e1568cb6d88a139cf09a2dbb5aba68bed43b Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Wed, 2 Nov 2016 11:39:22 -0700 Subject: [PATCH] Use explicit calls for function to self-document --- .gitignore | 3 ++- advanced/Scripts/update.sh | 14 +++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 19b458d3..c4b497a0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *.swp __pycache__ .cache -*.yml +.pullapprove.yml + diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh index da88127f..0b26ac7a 100644 --- a/advanced/Scripts/update.sh +++ b/advanced/Scripts/update.sh @@ -89,15 +89,11 @@ main() { fi echo "::: Checking for updates..." - # Checks Pi-hole version > pihole only > current local git repo version : returns string in format vX.X.X - pihole_version_current="$(/usr/local/bin/pihole -v -p -c)" - # Checks Pi-hole version > pihole only > remote upstream repo version : returns string in format vX.X.X - pihole_version_latest="$(/usr/local/bin/pihole -v -p -l)" - - # Checks Pi-hole version > admin only > current local git repo version : returns string in format vX.X.X - web_version_current="$(/usr/local/bin/pihole -v -a -c)" - # Checks Pi-hole version > admin only > remote upstream repo version : returns string in format vX.X.X - web_version_latest="$(/usr/local/bin/pihole -v -a -l)" + # Checks Pi-hole version string in format vX.X.X + pihole_version_current="$(/usr/local/bin/pihole version --pihole --current)" + pihole_version_latest="$(/usr/local/bin/pihole version --pihole --latest)" + web_version_current="$(/usr/local/bin/pihole version --admin --current)" + web_version_latest="$(/usr/local/bin/pihole version --admin --latest)" # Logic # If latest versions are blank - we've probably hit Github rate limit (stop running `pihole -up so often!):