From d36ee81a86445785d65e76ad2b5610660fde8d8b Mon Sep 17 00:00:00 2001
From: MDLeom <2809763-curben@users.noreply.gitlab.com>
Date: Sun, 4 Oct 2020 02:29:27 +0000
Subject: [PATCH] feat: drop AdGuard Home support in urlhaus-filter.txt

- BREAKING CHANGE
- AdGuard Home should use https://gitlab.com/curben/urlhaus-filter#domain-based-adguard-home
---
 README.md | 2 +-
 script.sh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1d6bb1c5..3e429271 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Regular version contains >260K filters, do note that uBO can [easily handle](htt
 
 If you've installed the lite version but prefer to use the regular version, it's better to remove it beforehand. Having two versions at the same time won't cause any conflict issue, uBO can detect duplicate network filters and adjust accordingly, but it's a waste of your bandwidth.
 
-**AdGuard Home** users should use [this blocklist](#domain-based-adguard-home), compatibility with URL-based blocklist is retained temporarily until in 30 Sep 2020 (UTC).
+**AdGuard Home** users should use [this blocklist](#domain-based-adguard-home).
 
 ## URL-based (AdGuard)
 
diff --git a/script.sh b/script.sh
index 15e3bcaa..6d861a11 100644
--- a/script.sh
+++ b/script.sh
@@ -136,14 +136,12 @@ sed '1 i\'"$COMMENT_ABP"'' | \
 sed "1s/Malicious/Online Malicious/" | \
 sed "1s/Blocklist/Blocklist (AdGuard Home)/" > "../urlhaus-filter-agh-online.txt"
 
-cat "malware-domains-adguard-home.txt" "malware-url-top-domains.txt" | \
+cat "malware-domains.txt" "malware-url-top-domains.txt" | \
 sort | \
-sed '1 i\'"\n! BREAKING CHANGE (1 Oct 2020): AdGuard Home should use this blocklist https://gitlab.com/curben/urlhaus-filter#domain-based-adguard-home\n"'' | \
 sed '1 i\'"$COMMENT_ABP"'' > "../urlhaus-filter.txt"
 
-cat "malware-domains-online-adguard-home.txt" "malware-url-top-domains-online.txt" | \
+cat "malware-domains-online.txt" "malware-url-top-domains-online.txt" | \
 sort | \
-sed '1 i\'"\n! BREAKING CHANGE (1 Oct 2020): AdGuard Home should use this blocklist https://gitlab.com/curben/urlhaus-filter#domain-based-adguard-home\n"'' | \
 sed '1 i\'"$COMMENT_ABP"'' | \
 sed "1s/Malicious/Online Malicious/" > "../urlhaus-filter-online.txt"