From e25a5329879028999488f4823d90dc2f5232a84f Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 25 Jun 2021 18:30:30 +0300 Subject: [PATCH] Pull request: all: rm inactive list, imp lint script Updates #2644. Squashed commit of the following: commit 1a1c2f0a232885d8ea6335bce2831a5a21fe800a Author: Ainar Garipov Date: Fri Jun 25 18:17:51 2021 +0300 all: rm inactive list, imp lint script --- internal/home/filter.go | 1 - scripts/make/go-lint.sh | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/home/filter.go b/internal/home/filter.go index 91cedd7e..03965fbf 100644 --- 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 index 8bc66031..1a94ae6b 100644 --- a/scripts/make/go-lint.sh +++ b/scripts/make/go-lint.sh @@ -50,7 +50,6 @@ 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. @@ -58,11 +57,11 @@ 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. ;; (*)