Merge branch 'master' into 3257-ifaces-source

heyxkhoa · Jun 28, 2021 · 0b9b42b · 0b9b42b
2 parents 530a1a2 + e25a532
commit 0b9b42b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/internal/home/filter.go b/internal/home/filter.go
@@ -59,7 +59,6 @@ func defaultFilters() []filter {
 	return []filter{
 		{Filter: filtering.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
 		{Filter: filtering.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway Default Blocklist"},
-		{Filter: filtering.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
 	}
 }
 

diff --git a/scripts/make/go-lint.sh b/scripts/make/go-lint.sh
@@ -50,19 +50,18 @@ trap not_found EXIT
 # Warnings
 
 go_min_version='go1.16'
-go_min_version_prefix="go version ${go_min_version}"
 go_version_msg="
 warning: your go version is different from the recommended minimal one (${go_min_version}).
 if you have the version installed, please set the GO environment variable.
 for example:
 
 	export GO='${go_min_version}'
 "
-readonly go_min_version go_min_version_prefix go_version_msg
+readonly go_min_version go_version_msg
 
 case "$( "$GO" version )"
 in
-("$go_min_version_prefix"*)
+('go version'*"$go_min_version"*)
 	# Go on.
 	;;
 (*)