From afe5176e017bcb9861a48d182cae5d19ce96209f Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:41:53 +0100 Subject: [PATCH 1/4] Justify help output to match main script --- advanced/Scripts/list.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 7cbe6beb..b465bdb6 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -42,11 +42,11 @@ helpFunc() { ::: Usage: pihole -${letter} domain1 [domain2 ...] ::: ::: Options: -::: -d, --delmode Remove domains from the ${word}list -::: -nr, --noreload Update ${word}list without refreshing dnsmasq -::: -q, --quiet output is less verbose -::: -h, --help Show this help dialog -::: -l, --list Display your ${word}listed domains +::: -d, --delmode Remove domains from the ${word}list +::: -nr, --noreload Update ${word}list without refreshing dnsmasq +::: -q, --quiet Output is less verbose +::: -h, --help Show this help dialog +::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then echo "::: -wild, --wildcard Add whitecard entry (only blacklist)" @@ -229,4 +229,3 @@ PoplistFile if ${reload}; then Reload fi - From 19e30b829ab913fae62001842443ee70aafae710 Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:42:14 +0100 Subject: [PATCH 2/4] Add wildcard description to help text, improve other help texts --- pihole | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pihole b/pihole index 89c22ec8..b3fc2367 100755 --- a/pihole +++ b/pihole @@ -274,19 +274,20 @@ helpFunc() { ::: Add -h after -w (whitelist), -b (blacklist), -c (chronometer), or -a (admin) for more information on usage ::: ::: Options: -::: -w, whitelist Whitelist domains -::: -b, blacklist Blacklist domains -::: -d, debug Start a debugging session if having trouble -::: -f, flush Flush the pihole.log file -::: -t, tail Output the last lines of the pihole.log file. Lines are appended as the file grows -::: -up, updatePihole Update Pi-hole +::: -w, whitelist Whitelist domain(s) +::: -b, blacklist Blacklist domain(s) (exact match) +::: -wild, wildcard Blacklist whole domain(s) (wildcard) +::: -d, debug Start a debugging session +::: -f, flush Flush the 'pihole.log' file +::: -t, tail Output the last lines of the 'pihole.log' file. Lines are appended as the file grows +::: -up, updatePihole Update Pi-hole components ::: -r, reconfigure Reconfigure or Repair Pi-hole ::: -g, updateGravity Update the list of ad-serving domains ::: -c, chronometer Calculates stats and displays to an LCD ::: -h, help Show this help dialog -::: -v, version Show current versions +::: -v, version Show installed versions of Pi-Hole and Web-Admin ::: -q, query Query the adlists for a specific domain -::: Use pihole -q domain -exact if you want to see exact matches only +::: Use 'pihole -q domain -exact' if you want to see exact matches only ::: -l, logging Enable or Disable logging (pass 'on' or 'off') ::: -a, admin Admin webpage options ::: uninstall Uninstall Pi-Hole from your system :(! @@ -294,7 +295,7 @@ helpFunc() { ::: enable Enable Pi-Hole DNS Blocking ::: disable Disable Pi-Hole DNS Blocking ::: Blocking can also be disabled only temporarily, e.g., -::: pihole disable 5m - will disable blocking for 5 minutes +::: 'pihole disable 5m' - will disable blocking for 5 minutes ::: restartdns Restart dnsmasq EOM exit 0 From 8037f3e3323a20c01725979f0f5b0be787d64fbb Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:55:14 +0100 Subject: [PATCH 3/4] Fix spacing for wildcard help in list script --- advanced/Scripts/list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index b465bdb6..64a24bf3 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -49,7 +49,7 @@ helpFunc() { ::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then - echo "::: -wild, --wildcard Add whitecard entry (only blacklist)" + echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" fi exit 0 } From 01f643e5eb2f5c851fdbdbcaace81ecae459c0ab Mon Sep 17 00:00:00 2001 From: Markus Napp Date: Wed, 8 Feb 2017 12:56:28 +0100 Subject: [PATCH 4/4] fixup! Fix spacing for wildcard help in list script --- advanced/Scripts/list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 64a24bf3..4634837a 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -49,7 +49,7 @@ helpFunc() { ::: -l, --list Display your ${word}listed domains EOM if [[ "${letter}" == "b" ]]; then - echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" + echo "::: -wild, --wildcard Add wildcard entry (only blacklist)" fi exit 0 }