Fix inconsistencies found by consistency audit of 395f76e

cmd/byre/serve.go

@@ -51,10 +51,12 @@ func serveCmd(args []string) {
 	}
 
 	// Protect local credentials before tsnet can write state or a login URL.
-	if err := os.MkdirAll(*dataDir, 0o700); err != nil {
+	err = os.MkdirAll(*dataDir, 0o700)
+	if err != nil {
 		fatal("create data directory", "err", err)
 	}
-	if err := os.Chmod(*dataDir, 0o700); err != nil {
+	err = os.Chmod(*dataDir, 0o700)
+	if err != nil {
 		fatal("protect data directory", "err", err)
 	}
 	// Keep ownership until shutdown; never unlink the lock file, since a new
@@ -64,15 +66,18 @@ func serveCmd(args []string) {
 		fatal("open service lock", "err", err)
 	}
 	defer lock.Close()
-	if err := syscall.Flock(int(lock.Fd()), syscall.LOCK_EX|syscall.LOCK_NB); err != nil {
+	err = syscall.Flock(int(lock.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
+	if err != nil {
 		fatal("acquire service lock", "data", *dataDir, "err", err)
 	}
 
 	token := rand.Text()
-	if err := os.WriteFile(filepath.Join(*dataDir, "loopback-token"), []byte(token), 0o600); err != nil {
+	err = os.WriteFile(filepath.Join(*dataDir, "loopback-token"), []byte(token), 0o600)
+	if err != nil {
 		fatal("write loopback credential", "err", err)
 	}
-	if err := os.Setenv("BYRE_TOKEN", token); err != nil {
+	err = os.Setenv("BYRE_TOKEN", token)
+	if err != nil {
 		fatal("export loopback credential", "err", err)
 	}
 	home, err := os.UserHomeDir()
@@ -80,14 +85,16 @@ func serveCmd(args []string) {
 		fatal("home directory", "err", err)
 	}
 	logDir := filepath.Join(home, "Library", "Logs")
-	if err := os.MkdirAll(logDir, 0o755); err != nil {
+	err = os.MkdirAll(logDir, 0o755)
+	if err != nil {
 		fatal("create log directory", "err", err)
 	}
 	logFile, err := os.OpenFile(filepath.Join(logDir, "byre.log"), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o600)
 	if err != nil {
 		fatal("open service log", "err", err)
 	}
-	if err := logFile.Chmod(0o600); err != nil {
+	err = logFile.Chmod(0o600)
+	if err != nil {
 		fatal("protect service log", "err", err)
 	}
 	logFile.Close()