a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: rm inactive list, imp lint script 

Updates #2644.

Squashed commit of the following:

commit 1a1c2f0a232885d8ea6335bce2831a5a21fe800a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jun 25 18:17:51 2021 +0300

    all: rm inactive list, imp lint script
This commit is contained in:
Ainar Garipov 2021-06-25 18:30:30 +03:00
parent 90a853627e
commit e25a532987
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/home/filter.go
View File

@ -59,7 +59,6 @@ func defaultFilters() []filter {
return []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: 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: 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"},
} }
} }

5
scripts/make/go-lint.sh
View File

@ -50,7 +50,6 @@ trap not_found EXIT
# Warnings # Warnings
go_min_version='go1.16' go_min_version='go1.16'
go_min_version_prefix="go version ${go_min_version}"
go_version_msg=" go_version_msg="
warning: your go version is different from the recommended minimal one (${go_min_version}). 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. if you have the version installed, please set the GO environment variable.
@ -58,11 +57,11 @@ for example:
export GO='${go_min_version}' 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 )" case "$( "$GO" version )"
in in
("$go_min_version_prefix"*) ('go version'*"$go_min_version"*)
# Go on. # Go on.
;; ;;
(*) (*)