From 761d948562fe91bfbaef6e5d428edec9743a264a Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 4 Jun 2023 12:57:43 +0300
Subject: [PATCH] Fatal(err) is enough

---
 main.go    | 14 +++++++-------
 refresh.go | 12 ++++++------
 upload.go  |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/main.go b/main.go
index 89aa5a6..c3342c7 100644
--- a/main.go
+++ b/main.go
@@ -151,7 +151,7 @@ func main() {
 	}
 	Root = flag.Args()[0]
 	if _, err := os.Stat(Root); err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 
 	if *FSCK {
@@ -178,7 +178,7 @@ func main() {
 					os.FileMode(0666),
 				)
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 				passwdReader(fd)
 				fd.Close()
@@ -194,7 +194,7 @@ func main() {
 					os.FileMode(0666),
 				)
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 				passwdLister(fd)
 				fd.Close()
@@ -203,7 +203,7 @@ func main() {
 	}
 
 	if (*TLSCert != "" && *TLSKey == "") || (*TLSCert == "" && *TLSKey != "") {
-		log.Fatalln("Both -tls-cert and -tls-key are required")
+		log.Fatal("Both -tls-cert and -tls-key are required")
 	}
 
 	UmaskCur = syscall.Umask(0)
@@ -212,7 +212,7 @@ func main() {
 	var err error
 	PyPIURLParsed, err = url.Parse(*PyPIURL)
 	if err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 	tlsConfig := tls.Config{
 		ClientSessionCache: tls.NewLRUClientSessionCache(16),
@@ -225,7 +225,7 @@ func main() {
 	if *PyPICertHash != "" {
 		ourDgst, err := hex.DecodeString(*PyPICertHash)
 		if err != nil {
-			log.Fatalln(err)
+			log.Fatal(err)
 		}
 		tlsConfig.VerifyConnection = func(s tls.ConnectionState) error {
 			spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
@@ -253,7 +253,7 @@ func main() {
 		server.ConnState = connStater
 		err := server.Serve(ln)
 		if _, ok := err.(UCSPIAlreadyAccepted); !ok {
-			log.Fatalln(err)
+			log.Fatal(err)
 		}
 		UCSPIJob.Wait()
 		return
diff --git a/refresh.go b/refresh.go
index 9aa4849..2066eaf 100644
--- a/refresh.go
+++ b/refresh.go
@@ -72,7 +72,7 @@ func blake2b256New() hash.Hash {
 func agentedReq(url string) *http.Request {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 	req.Header.Set("User-Agent", UserAgent)
 	return req
@@ -148,7 +148,7 @@ func refreshDir(
 					Name:  MDFieldToRecField[recField],
 					Value: jsonField,
 				}); err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 			for _, m := range []RecFieldToValuesMap{
@@ -165,7 +165,7 @@ func refreshDir(
 						Name:  MDFieldToRecField[m.recField],
 						Value: v,
 					}); err != nil {
-						log.Fatalln(err)
+						log.Fatal(err)
 					}
 				}
 			}
@@ -204,7 +204,7 @@ func refreshDir(
 					Name:  MDFieldToRecField[recField],
 					Value: jsonField,
 				}); err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 
@@ -217,7 +217,7 @@ func refreshDir(
 						Name:  MDFieldToRecField[m.recField],
 						Value: v,
 					}); err != nil {
-						log.Fatalln(err)
+						log.Fatal(err)
 					}
 				}
 			}
@@ -229,7 +229,7 @@ func refreshDir(
 			if _, err = wr.WriteFieldMultiline(
 				MDFieldDescription, lines,
 			); err != nil {
-				log.Fatalln(err)
+				log.Fatal(err)
 			}
 		}
 
diff --git a/upload.go b/upload.go
index 72c00d3..ff7ad74 100644
--- a/upload.go
+++ b/upload.go
@@ -208,7 +208,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 					})
 				}
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 		}
-- 
2.44.0