Merge d29b8f2afa32fb0d249dc719d5522ca19c0f600d into c348593ef4af350eaad92925cf9684f5947d70cb

cmd/yarr/main.go

@@ -90,8 +90,8 @@ func main() {
 		log.SetOutput(os.Stdout)
 	}
 
-	if open && strings.ContainsRune(addr, os.PathSeparator) {
+	if open && strings.HasPrefix(addr, "unix:") {
-		log.Fatal("Cannot open unix socket path (", addr, ") in browser")
+		log.Fatal("Cannot open ", addr, " in browser")
 	}
 
 	if db == "" {

readme.md

@@ -13,9 +13,9 @@ The latest prebuilt binaries for Linux/MacOS/Windows are available
 [here](https://github.com/nkanaev/yarr/releases/latest).
 The archives follow the naming convention `yarr_{OS}_{ARCH}[_gui].zip`, where:
 
-* `OS` corresponds to the target operating system (darwin/linux/windows for Linux, MacOS, Windows, respectively)
+* `OS` is the target operating system
-* `ARCH` is the CPU architecture (`arm64` for AMD64/Aarch64, `amd64` for X86-64)
+* `ARCH` is the CPU architecture (`arm64` for AArch64, `amd64` for X86-64)
-* `-gui` indicates that the application ships with the GUI (tray icon), and is a command line application if omitted
+* `-gui` indicates that the binary ships with the GUI (tray icon), and is a command line application if omitted
 
 Usage instructions:
 

src/server/server.go

@@ -56,16 +56,19 @@ func (s *Server) Start() {
 		s.worker.RefreshFeeds()
 	}
 
-	network := "tcp"
+	var ln net.Listener
-	if strings.ContainsRune(s.Addr, os.PathSeparator) {
+	var err error
-		network = "unix"
+
-		err := os.Remove(s.Addr)
+	if path, isUnix := strings.CutPrefix(s.Addr, "unix:"); isUnix {
+		err = os.Remove(path)
 		if err != nil {
-			log.Fatal(err)
+			log.Print(err)
 		}
+		ln, err = net.Listen("unix", path)
+	} else {
+		ln, err = net.Listen("tcp", s.Addr)
 	}
 
-	ln, err := net.Listen(network, s.Addr)
 	if err != nil {
 		log.Fatal(err)
 	}