arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-03 12:40:56 +00:00
Code Issues Releases Wiki Activity

more merge conflicts!

Browse Source
This commit is contained in:
Adam Warner 2017-05-14 16:43:20 +01:00
commit 90119c75d5
No known key found for this signature in database
GPG Key ID: 7C062498C7FA6E49
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
advanced/Scripts/list.sh
View File

@ -42,13 +42,13 @@ Options:"
if [[ "${letter}" == "b" ]]; then if [[ "${letter}" == "b" ]]; then
echo " -wild, --wildcard Add wildcard entry to blacklist" echo " -wild, --wildcard Add wildcard entry to blacklist"
fi fi
echo " -d, --delmode Remove domain(s) from the ${word}list echo " -d, --delmode Remove domain(s) from the ${word}list
-nr, --noreload Update ${word}list without refreshing dnsmasq -nr, --noreload Update ${word}list without refreshing dnsmasq
-q, --quiet Make output less verbose -q, --quiet Make output less verbose
-h, --help Show this help dialog -h, --help Show this help dialog
-l, --list Display all your ${word}listed domains" -l, --list Display all your ${word}listed domains"
exit 0 exit 0
} }
@ -77,7 +77,7 @@ PoplistFile() {
if [[ ! -f ${whitelist} ]]; then if [[ ! -f ${whitelist} ]]; then
touch ${whitelist} touch ${whitelist}
fi fi
for dom in "${domList[@]}"; do for dom in "${domList[@]}"; do
# Logic: If addmode then add to desired list and remove from the other; if delmode then remove from desired list but do not add to the other # Logic: If addmode then add to desired list and remove from the other; if delmode then remove from desired list but do not add to the other
if ${addmode}; then if ${addmode}; then