From d53f9bafe9abef0390c892421e051ddd9c700590 Mon Sep 17 00:00:00 2001 From: Eugene Bujak Date: Thu, 30 Aug 2018 19:05:03 +0300 Subject: [PATCH] Makefile -- replace sed with perl, add check that plugin.cfg has dnsfilter --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff892241..b4f90ea8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,8 @@ AdguardDNS: $(STATIC) *.go coredns: coredns_plugin/*.go dnsfilter/*.go echo mkfile_dir = $(mkfile_dir) go get -v -d github.com/coredns/coredns - cd $(GOPATH)/src/github.com/coredns/coredns && grep -q 'dnsfilter:' plugin.cfg || sed -E -i.bak $$'s|^log:log|log:log\\\ndnsfilter:github.com/AdguardTeam/AdguardDNS/coredns_plugin|g' plugin.cfg + cd $(GOPATH)/src/github.com/coredns/coredns && grep -q '^dnsfilter:' plugin.cfg || perl -p -i.bak -e 's|^log:log|log:log\ndnsfilter:github.com/AdguardTeam/AdguardDNS/coredns_plugin|' plugin.cfg + grep '^dnsfilter:' $(GOPATH)/src/github.com/coredns/coredns/plugin.cfg ## used to check that plugin.cfg was successfully edited by sed cd $(GOPATH)/src/github.com/coredns/coredns && GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) go generate cd $(GOPATH)/src/github.com/coredns/coredns && go get -v -d . cd $(GOPATH)/src/github.com/coredns/coredns && go build -o $(mkfile_dir)/coredns