From a5a49ff08056a67cc57435f219aa157342a0d9a0 Mon Sep 17 00:00:00 2001
From: Mitch Riedstra <mitch@riedstra.us>
Date: Mon, 2 Aug 2021 20:10:23 -0400
Subject: Compatibility with MacOS. Starting browsers is now a bit simplier on
 each platform.

---
 cmd/web/main.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'cmd/web/main.go')

diff --git a/cmd/web/main.go b/cmd/web/main.go
index c799624..6db58d9 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net"
 	"net/http"
 	"os"
 	"strconv"
@@ -67,15 +68,11 @@ func main() {
 		http.FileServer(http.FS(embeddedStatic)))
 	r.HandleFunc("/", a.HandleIndex)
 
-	s := http.Server{
-		Handler: r,
-		Addr:    Listen,
-	}
-
-	go startBrowser()
+	s := http.Server{Handler: r}
 
 	for i := 0; i < 5; i++ {
-		err = s.ListenAndServe()
+		l, err := net.Listen("tcp", Listen)
+
 		if err != nil {
 			Logger.Printf("Encountered: %s", err)
 
@@ -89,8 +86,14 @@ func main() {
 			Listen = fmt.Sprintf("%s:%d", parts[0], port)
 
 			Logger.Printf("Trying: %s", Listen)
-			s.Addr = Listen
+			continue
 		}
 
+		startBrowser("http://localhost" + Listen)
+
+		err = s.Serve(l)
+		if err != nil {
+			panic(err)
+		}
 	}
 }
-- 
cgit v1.2.3