From 941a766aa3a3c2311df9a8676d556ea5df3ba1ed Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Thu, 12 Jul 2018 21:38:43 -0400 Subject: [PATCH] Replace -wild and -regex with --wild and --regex Signed-off-by: Mcat12 --- advanced/Scripts/list.sh | 4 ++-- manpages/pihole.8 | 10 +++++----- pihole | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 0088e0c1..97de1604 100755 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -245,8 +245,8 @@ for var in "$@"; do case "${var}" in "-w" | "whitelist" ) listMain="${whitelist}"; listAlt="${blacklist}";; "-b" | "blacklist" ) listMain="${blacklist}"; listAlt="${whitelist}";; - "-wild" | "wildcard" ) listMain="${regexlist}"; wildcard=true;; - "-regex" | "regex" ) listMain="${regexlist}";; + "--wild" | "wildcard" ) listMain="${regexlist}"; wildcard=true;; + "--regex" | "regex" ) listMain="${regexlist}";; "-nr"| "--noreload" ) reload=false;; "-d" | "--delmode" ) addmode=false;; "-q" | "--quiet" ) verbose=false;; diff --git a/manpages/pihole.8 b/manpages/pihole.8 index 1017aaea..c30570df 100644 --- a/manpages/pihole.8 +++ b/manpages/pihole.8 @@ -5,7 +5,7 @@ Pi-hole : A black-hole for internet advertisements .br .SH "SYNOPSIS" -\fBpihole\fR (\fB-w\fR|\fB-b\fR|\fB-wild\fR|\fB-regex\fR) [options] domain(s) +\fBpihole\fR (\fB-w\fR|\fB-b\fR|\fB--wild\fR|\fB--regex\fR) [options] domain(s) .br \fBpihole -a\fR \fB-p\fR password .br @@ -66,12 +66,12 @@ Available commands and options: Adds or removes specified domain or domains to the blacklist .br -\fB-wild, wildcard\fR [options] [ ] +\fB--wild, wildcard\fR [options] [ ] .br Add or removes specified domain to the wildcard blacklist .br -\fB-regex, regex\fR [options] [ ] +\fB--regex, regex\fR [options] [ ] .br Add or removes specified regex filter to the regex blacklist .br @@ -282,10 +282,10 @@ Some usage examples .br \fBpihole -b -d noads.example.com\fR Remove "noads.example.com" from blacklist .br - \fBpihole -wild example.com\fR Add example.com as a wildcard - would + \fBpihole --wild example.com\fR Add example.com as a wildcard - would block all subdomains of example.com, including example.com itself. .br - \fBpihole -regex "ad.*\.example\.com$"\fR Add "ad.*\.example\.com$" to the regex + \fBpihole --regex "ad.*\.example\.com$"\fR Add "ad.*\.example\.com$" to the regex blacklist - would block all subdomains of example.com which start with "ad" .br diff --git a/pihole b/pihole index ce8ea82b..fea9b339 100755 --- a/pihole +++ b/pihole @@ -393,8 +393,8 @@ Add '-h' after specific commands for more information on usage Whitelist/Blacklist Options: -w, whitelist Whitelist domain(s) -b, blacklist Blacklist domain(s) - -wild, wildcard Wildcard blacklist domain(s) - -regex, regex Regex blacklist domains(s) + --wild, wildcard Wildcard blacklist domain(s) + --regex, regex Regex blacklist domains(s) Add '-h' for more info on whitelist/blacklist usage Debugging Options: @@ -438,8 +438,8 @@ fi case "${1}" in "-w" | "whitelist" ) listFunc "$@";; "-b" | "blacklist" ) listFunc "$@";; - "-wild" | "wildcard" ) listFunc "$@";; - "-regex" | "regex" ) listFunc "$@";; + "--wild" | "wildcard" ) listFunc "$@";; + "--regex" | "regex" ) listFunc "$@";; "-d" | "debug" ) debugFunc "$@";; "-f" | "flush" ) flushFunc "$@";; "-up" | "updatePihole" ) updatePiholeFunc "$@";;