From ae47be0ce92376c64f37deb9fd96217d3fe87782 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Wed, 17 Aug 2016 18:59:00 +0100 Subject: [PATCH 1/2] Add HelpFunc --- gravity.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gravity.sh b/gravity.sh index 6278d80a..b5b119f3 100755 --- a/gravity.sh +++ b/gravity.sh @@ -27,6 +27,18 @@ else fi fi +function helpFunc() +{ + echo "::: Pull in domains from adlists" + echo ":::" + echo "::: Usage: pihole -g" + echo ":::" + echo "::: Options:" + echo "::: -f, --force Force lists to be downloaded, even if they don't need updating." + echo "::: -h, --help Show this help dialog" + exit 1 +} + piholeIPfile=/etc/pihole/piholeIP piholeIPv6file=/etc/pihole/.useIPv6 From f6ac0d73b4fd017096fda97d7cf3e991db1b6997 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Wed, 17 Aug 2016 19:08:55 +0100 Subject: [PATCH 2/2] Add force delete option --- gravity.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gravity.sh b/gravity.sh index b5b119f3..52d4ee5b 100755 --- a/gravity.sh +++ b/gravity.sh @@ -340,6 +340,23 @@ function gravity_reload() { echo " done!" } + +for var in "$@" +do + case "$var" in + "-f" | "--force" ) force=true;; + "-h" | "--help" ) helpFunc;; + esac +done + +#Overwrite adlists.default from /etc/.pihole in case any changes have been made. Changes should be saved in /etc/adlists.list + +if $force; then + echo -n "::: Deleting exising list cache..." + $SUDO rm /etc/pihole/list.* + echo " done!" +fi + $SUDO cp /etc/.pihole/adlists.default /etc/pihole/adlists.default gravity_collapse gravity_spinup