From fee55fa6422a840d1f6b7957492e365ba325d287 Mon Sep 17 00:00:00 2001 From: nate Date: Mon, 28 Mar 2016 18:37:49 -0500 Subject: [PATCH] Added gravity.sh to the list of options --- advanced/Scripts/blacklist.sh | 2 +- advanced/Scripts/chronometer.sh | 2 +- advanced/Scripts/whitelist.sh | 2 +- pihole.sh | 21 +++++++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/advanced/Scripts/blacklist.sh b/advanced/Scripts/blacklist.sh index 158de7e2..e370142b 100755 --- a/advanced/Scripts/blacklist.sh +++ b/advanced/Scripts/blacklist.sh @@ -13,7 +13,7 @@ if [[ $# = 0 ]]; then echo "::: Immediately blacklists one or more domains in the hosts file" echo ":::" - echo "::: Usage: pihole.sh -b domain1 [domain2 ...]" + echo "::: Usage: sudo pihole.sh -b domain1 [domain2 ...]" echo ":::" echo "::: Options:" echo "::: -d, --delmode Remove domains from the blacklist" diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh index 326ec2b0..d1cef601 100755 --- a/advanced/Scripts/chronometer.sh +++ b/advanced/Scripts/chronometer.sh @@ -120,7 +120,7 @@ function normalChrono(){ function displayHelp(){ echo "::: Displays stats about your piHole!" echo ":::" - echo "::: Usage: pihole.sh -c [optional:-j]" + echo "::: Usage: sudo pihole.sh -c [optional:-j]" echo "::: Note: If no option is passed, then stats are displayed on screen, updated every 5 seconds" echo ":::" echo "::: Options:" diff --git a/advanced/Scripts/whitelist.sh b/advanced/Scripts/whitelist.sh index fa2379c6..8aec77af 100755 --- a/advanced/Scripts/whitelist.sh +++ b/advanced/Scripts/whitelist.sh @@ -13,7 +13,7 @@ if [[ $# = 0 ]]; then echo "::: Immediately whitelists one or more domains in the hosts file" echo ":::" - echo "::: Usage: pihole -w domain1 [domain2 ...]" + echo "::: Usage: sudo pihole.sh -w domain1 [domain2 ...]" echo ":::" echo "::: Options:" echo "::: -d, --delmode Remove domains from the whitelist" diff --git a/pihole.sh b/pihole.sh index 3a2ce22c..f730c210 100644 --- a/pihole.sh +++ b/pihole.sh @@ -61,6 +61,10 @@ function chronometerFunc { $SUDO /opt/pihole/chronometer.sh exit 1 } +function gravityFunc { + $SUDO /opt/pihole/gravity.sh + exit 1 +} function helpFunc { echo "::: Control all PiHole specific functions!" @@ -69,14 +73,15 @@ function helpFunc { printf ":::\tAdd -h after -w, -b, or -c for more information on usage\n" echo ":::" echo "::: Options:" - printf "::: -w, --whitelist\t\tWhitelist domains\n" - printf "::: -b, --blacklist\t\tBlacklist domains\n" - printf "::: -d, --debug\t\tStart a debugging session if having trouble\n" - printf "::: -f, --flush\t\tFlush the pihole.log file\n" - printf "::: -u, --updateDashboard\t\tUpdate the web dashboard manually\n" - printf "::: -s, --setupLCD\t\tAutomatically configures the Pi to use the 2.8 LCD screen to display stats on it\n" - printf "::: -c, --chronometer\t\tCalculates stats and displays to an LCD\n" - printf "::: -h, --help\t\tShow this help dialog\n" + echo "::: -w, --whitelist Whitelist domains" + echo "::: -b, --blacklist Blacklist domains" + echo "::: -d, --debug Start a debugging session if having trouble" + echo "::: -f, --flush Flush the pihole.log file" + echo "::: -u, --updateDashboard Update the web dashboard manually" + echo "::: -g, --updateGravity Update the list of ad-serving domains" + echo "::: -s, --setupLCD Automatically configures the Pi to use the 2.8 LCD screen to display stats on it" + echo "::: -c, --chronometer Calculates stats and displays to an LCD" + echo "::: -h, --help Show this help dialog" exit 1 }