From ec13286d86a377c515e641ca433d518d4d83a6bd Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 6 Aug 2024 14:51:59 +0300
Subject: [PATCH] Fix various lint warnings and suggestions

---
 cmd/meta4ra/check.go    |  5 +++--
 cmd/meta4ra/create.go   | 10 +++++++---
 cmd/meta4ra/progress.go |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cmd/meta4ra/check.go b/cmd/meta4ra/check.go
index 88ab9cf..f46c4c7 100644
--- a/cmd/meta4ra/check.go
+++ b/cmd/meta4ra/check.go
@@ -107,7 +107,7 @@ That can be used as a downloading utility.
 			if err = os.WriteFile(
 				fn,
 				[]byte(strings.TrimPrefix(sig.Signature, "\n")),
-				fs.FileMode(0666),
+				fs.FileMode(0o666),
 			); err != nil {
 				log.Println("Error:", f.Name, "can not save signature:", err)
 				bad = true
@@ -177,7 +177,8 @@ That can be used as a downloading utility.
 			}
 		}
 		if *dl != -1 {
-			resp, err := http.Get(f.URLs[*dl].URL)
+			var resp *http.Response
+			resp, err = http.Get(f.URLs[*dl].URL)
 			if err != nil {
 				log.Println("Error:", f.Name, err)
 				bad = true
diff --git a/cmd/meta4ra/create.go b/cmd/meta4ra/create.go
index 35fc136..b2d2b4c 100644
--- a/cmd/meta4ra/create.go
+++ b/cmd/meta4ra/create.go
@@ -21,6 +21,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
 	"os"
 	"path"
@@ -90,7 +91,8 @@ func runCreate() {
 		Hashes:      dgsts,
 	}
 	if *sigPGP != "" {
-		sigData, err := os.ReadFile(*sigPGP)
+		var sigData []byte
+		sigData, err = os.ReadFile(*sigPGP)
 		if err != nil {
 			log.Fatalln(err)
 		}
@@ -100,7 +102,8 @@ func runCreate() {
 		})
 	}
 	if *sigSSH != "" {
-		sigData, err := os.ReadFile(*sigSSH)
+		var sigData []byte
+		sigData, err = os.ReadFile(*sigSSH)
 		if err != nil {
 			log.Fatalln(err)
 		}
@@ -116,7 +119,8 @@ func runCreate() {
 	if *mtime == "" {
 		published = time.Now()
 	} else {
-		fi, err := os.Stat(*mtime)
+		var fi fs.FileInfo
+		fi, err = os.Stat(*mtime)
 		if err != nil {
 			log.Fatalln(err)
 		}
diff --git a/cmd/meta4ra/progress.go b/cmd/meta4ra/progress.go
index d34d98e..d5ce2b6 100644
--- a/cmd/meta4ra/progress.go
+++ b/cmd/meta4ra/progress.go
@@ -27,9 +27,9 @@ import (
 var ProgressPeriod = time.Second
 
 type Progress struct {
+	w            io.Writer
 	now, next    time.Time
 	wrote, total uint64
-	w            io.Writer
 }
 
 func (p *Progress) Write(data []byte) (n int, err error) {
-- 
2.48.1