.gitignore

@@ -1,3 +1,2 @@
-/*.list.old
+block.list
-/block.list
+*.list.old
-/update.cfg

README.md

@@ -59,13 +59,8 @@ static domain_name_servers=127.0.0.1
 ## License
 
 Copyright (C) 2021-2022 Dan Church.
-
 License GPLv3: GNU GPL version 3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
-
 with Commons Clause 1.0 (https://commonsclause.com/).
-
 This is free software: you are free to change and redistribute it.
-
 There is NO WARRANTY, to the extent permitted by law.
-
 You may NOT use this software for commercial purposes.

lists/.gitignore

@@ -1,7 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
-# ... And some others
-!/AdroitAdorKhan-core.hosts
-!/custom-ad-domains.domains

update.cfg.example

@@ -17,26 +17,13 @@
 #BACKUPSUFFIX=
 #BLOCKLIST=$WORKDIR/block.list
 #LIST_DIR=$WORKDIR/lists
-
-# Simple URL grab list
-# Mirror any URL to the 'lists' directory.
-# Note: URL and OUT indices are correlated, e.g. URL[10] will be retrieved and
-# stored in OUT[10]
-# Example config:
-#   URL+=('https://example.com/mylist.hosts')
-#   OUT+=("$LIST_DIR/mylist.hosts")
-#   URL+=('https://example.com/others.hosts')
-#   OUT+=("$LIST_DIR/others.hosts")
 #OUT=()
 #URL=()
 
-# What to run in order to restart dnsmasq. Leave empty to restart manually.
+# Individual hosts lists in that collection
-# Note: if you need shell features, use (bash -c '...')
+#OUT+=("$LIST_DIR/sb-Badd-Boyz-Hosts.hosts")
-# Typical value:
+#URL+=('https://raw.githubusercontent.com/StevenBlack/hosts/master/data/Badd-Boyz-Hosts/hosts')
-#   Ubuntu/Debian/CentOS:
+
-#   DNSMASQ_RESTART_COMMAND=(service dnsmasq restart)
+# Not sure how I'm supposed to update this file...
-#   Slackware:
+#OUT+=("$LIST_DIR/list.1.raw.githubusercontent.com.domains")
-#   DNSMASQ_RESTART_COMMAND=(/etc/rc.d/rc.dnsmasq restart)
+#URL+=('???')
-#   Mac OSX (with homebrew):
-#   DNSMASQ_RESTART_COMMAND=(brew services restart dnsmasq)
-#DNSMASQ_RESTART_COMMAND=()

update.sh

@@ -25,7 +25,6 @@ BLOCKLIST=$WORKDIR/block.list
 LIST_DIR=$WORKDIR/lists
 OUT=()
 URL=()
-DNSMASQ_RESTART_COMMAND=()
 if [[ -f $CFG ]]; then
     . "$CFG"
 fi
@@ -91,6 +90,6 @@ if [[ -n $BACKUPSUFFIX && -f $BLOCKLIST$BACKUPSUFFIX ]]; then
     fi
 fi
 
-if [[ ${#DNSMASQ_RESTART_COMMAND[@]} -gt 0 ]]; then
+if [[ -x /etc/rc.d/rc.dnsmasq ]]; then
-    "${DNSMASQ_RESTART_COMMAND[@]}"
+    /etc/rc.d/rc.dnsmasq restart
 fi