From 4c8e9559469b1a62c1a8ccda36d5514a46420bb8 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 15 Mar 2023 17:46:52 +0100
Subject: [PATCH] Move DefaultUnixAdminPath to config package

We can drop the soju package import. This shrinks down sojuctl's
size significantly (18M to 3M).
---
 Makefile            | 2 +-
 cmd/soju/main.go    | 2 +-
 cmd/sojuctl/main.go | 3 +--
 config/config.go    | 5 ++++-
 doc/soju.1.scd      | 4 ++++
 server.go           | 2 --
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9caff35..4cdb496 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ config_path := $(SYSCONFDIR)/soju/config
 admin_socket_path := $(RUNDIR)/soju/admin
 goflags := $(GOFLAGS) -ldflags=" \
 	-X 'git.sr.ht/~emersion/soju/config.DefaultPath=$(config_path)' \
-	-X 'git.sr.ht/~emersion/soju.DefaultUnixAdminPath=$(admin_socket_path)'"
+	-X 'git.sr.ht/~emersion/soju/config.DefaultUnixAdminPath=$(admin_socket_path)'"
 
 all: soju sojudb sojuctl doc/soju.1
 
diff --git a/cmd/soju/main.go b/cmd/soju/main.go
index 4657e78..2110131 100644
--- a/cmd/soju/main.go
+++ b/cmd/soju/main.go
@@ -214,7 +214,7 @@ func main() {
 		case "unix+admin":
 			path := u.Path
 			if path == "" {
-				path = soju.DefaultUnixAdminPath
+				path = config.DefaultUnixAdminPath
 			}
 			ln, err := net.Listen("unix", path)
 			if err != nil {
diff --git a/cmd/sojuctl/main.go b/cmd/sojuctl/main.go
index 19ddc77..39252fd 100644
--- a/cmd/sojuctl/main.go
+++ b/cmd/sojuctl/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"git.sr.ht/~emersion/soju"
 	"gopkg.in/irc.v4"
 	"log"
 	"net"
@@ -37,7 +36,7 @@ func run(ctx context.Context, cfg *config.Server, words []string) error {
 		if u.Path != "" {
 			path = u.Path
 		} else {
-			path = soju.DefaultUnixAdminPath
+			path = config.DefaultUnixAdminPath
 		}
 		break
 	}
diff --git a/config/config.go b/config/config.go
index 3579ca3..6e3707b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -11,7 +11,10 @@ import (
 	"git.sr.ht/~emersion/go-scfg"
 )
 
-var DefaultPath string
+var (
+	DefaultPath          string
+	DefaultUnixAdminPath = "/run/soju/admin"
+)
 
 type IPSet []*net.IPNet
 
diff --git a/doc/soju.1.scd b/doc/soju.1.scd
index 6996a41..aae2b20 100644
--- a/doc/soju.1.scd
+++ b/doc/soju.1.scd
@@ -516,3 +516,7 @@ character.
 Maintained by Simon Ser <contact@emersion.fr>, who is assisted by other
 open-source contributors. For more information about soju development, see
 <https://sr.ht/~emersion/soju>.
+
+# SEE ALSO
+
+*sojuctl*(1)
diff --git a/server.go b/server.go
index 74e7fd5..7cfad59 100644
--- a/server.go
+++ b/server.go
@@ -26,8 +26,6 @@ import (
 	"git.sr.ht/~emersion/soju/identd"
 )
 
-var DefaultUnixAdminPath = "/run/soju/admin"
-
 // TODO: make configurable
 var retryConnectMinDelay = time.Minute
 var retryConnectMaxDelay = 10 * time.Minute