all: fix build, imp err handling

.gitignore

@@ -4,13 +4,14 @@
 #
 # See https://stackoverflow.com/a/7335487/1892060.
 #
-# Only build, run, and test outputs here.  Sorted.
+# Only build, run, and test outputs here.  Sorted.  With negations at the
+# bottom to make sure they take effect.
 *.db
 *.log
 *.snap
 /bin/
-/build/
-/build2/
+/build/*
+/build2/*
 /data/
 /dist/
 /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
@@ -22,3 +23,6 @@ AdGuardHome*
 coverage.txt
 leases.db
 node_modules/
+
+!/build/gitkeep
+!/build2/gitkeep

build/gitkeep

@@ -0,0 +1 @@
+Keep this file non-hidden for Go's embedding to work.

build2/gitkeep

@@ -0,0 +1 @@
+Keep this file non-hidden for Go's embedding to work.

internal/dnsfilter/dnsfilter.go

@@ -587,14 +587,14 @@ func createFilteringEngine(filters []Filter) (*filterlist.RuleStorage, *urlfilte
 			// used.
 			data, err := os.ReadFile(f.FilePath)
 			if err != nil {
-				return nil, nil, fmt.Errorf("os.ReadFile(): %s: %w", f.FilePath, err)
+				return nil, nil, fmt.Errorf("reading filter content: %w", err)
 			}
+
 			list = &filterlist.StringRuleList{
 				ID:             int(f.ID),
 				RulesText:      string(data),
 				IgnoreCosmetic: true,
 			}
-
 		} else {
 			var err error
 			list, err = filterlist.NewFileRuleList(int(f.ID), f.FilePath, true)

internal/home/authglinet.go

@@ -79,7 +79,8 @@ func glGetTokenDate(file string) uint32 {
 
 	fileReadCloser, err := aghio.LimitReadCloser(f, MaxFileSize)
 	if err != nil {
-		log.Error("LimitReadCloser: %s", err)
+		log.Error("creating limited reader: %s", err)
+
 		return 0
 	}
 	defer fileReadCloser.Close()
@@ -89,14 +90,16 @@ func glGetTokenDate(file string) uint32 {
 	// This use of ReadAll is now safe, because we limited reader.
 	bs, err := io.ReadAll(fileReadCloser)
 	if err != nil {
-		log.Error("io.ReadAll: %s", err)
+		log.Error("reading token: %s", err)
+
 		return 0
 	}
+
 	buf := bytes.NewBuffer(bs)
 
 	err = binary.Read(buf, aghos.NativeEndian, &dateToken)
 	if err != nil {
-		log.Error("binary.Read: %s", err)
+		log.Error("decoding token: %s", err)
 
 		return 0
 	}

main.go

@@ -6,7 +6,7 @@ import (
 	"github.com/AdguardTeam/AdGuardHome/internal/home"
 )
 
-//go:embed build/static build2/static
+//go:embed build build2
 var clientBuildFS embed.FS
 
 func main() {

scripts/make/clean.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 verbose="${VERBOSE:-0}"
+readonly verbose
 
 if [ "$verbose" -gt '0' ]
 then
@@ -11,17 +12,19 @@ set -e -f -u
 
 dist_dir="$DIST_DIR"
 go="${GO:-go}"
+sudo_cmd="${SUDO:-}"
+readonly dist_dir go sudo_cmd
 
-rm -f\
+$sudo_cmd rm -f\
 	./AdGuardHome\
 	./AdGuardHome.exe\
 	./coverage.txt\
 	;
 
-rm -f -r\
+$sudo_cmd rm -f -r\
 	./bin/\
-	./build/\
-	./build2/\
+	./build/static/\
+	./build2/static/\
 	./client/node_modules/\
 	./client2/node_modules/\
 	./data/\