From 6e2e825a5fe3c4148347067e58309d55e4771bf8 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 5 Aug 2019 21:10:52 +0200
Subject: [PATCH] Rename options "pihole --whiteregex" to "pihole
 --white-regex" for the sake of readability. The same applied for "whitewild"
 -> "white-wild"

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 advanced/Scripts/list.sh | 8 ++++----
 pihole                   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh
index 60b820f5..6a606665 100755
--- a/advanced/Scripts/list.sh
+++ b/advanced/Scripts/list.sh
@@ -39,10 +39,10 @@ helpFunc() {
         param="-regex"
         type="regex blacklist filter"
     elif [[ "${listType}" == "regex_whitelist" && "${wildcard}" == true ]]; then
-        param="-whitewild"
+        param="-white-wild"
         type="wildcard whitelist"
     elif [[ "${listType}" == "regex_whitelist" ]]; then
-        param="-whiteregex"
+        param="-white-regex"
         type="regex whitelist filter"
     else
         param="b"
@@ -230,8 +230,8 @@ for var in "$@"; do
         "-b" | "blacklist"   ) listType="blacklist"; listAlt="whitelist";;
         "--wild" | "wildcard" ) listType="regex_blacklist"; wildcard=true;;
         "--regex" | "regex"   ) listType="regex_blacklist";;
-        "--whiteregex" | "whiteregex" ) listType="regex_whitelist";;
-        "--whitewild" | "whitewild" ) listType="regex_whitelist"; wildcard=true;;
+        "--white-regex" | "white-regex" ) listType="regex_whitelist";;
+        "--white-wild" | "white-wild" ) listType="regex_whitelist"; wildcard=true;;
         "-nr"| "--noreload"  ) reload=false;;
         "-d" | "--delmode"   ) addmode=false;;
         "-q" | "--quiet"     ) verbose=false;;
diff --git a/pihole b/pihole
index 5d373a47..dfd6eda9 100755
--- a/pihole
+++ b/pihole
@@ -440,8 +440,8 @@ case "${1}" in
   "-b" | "blacklist"            ) listFunc "$@";;
   "--wild" | "wildcard"         ) listFunc "$@";;
   "--regex" | "regex"           ) listFunc "$@";;
-  "--whiteregex" | "whiteregex" ) listFunc "$@";;
-  "--whitewild" | "whitewild"   ) listFunc "$@";;
+  "--white-regex" | "white-regex" ) listFunc "$@";;
+  "--white-wild" | "white-wild"   ) listFunc "$@";;
   "-d" | "debug"                ) debugFunc "$@";;
   "-f" | "flush"                ) flushFunc "$@";;
   "-up" | "updatePihole"        ) updatePiholeFunc "$@";;