diff --git a/Makefile b/Makefile index 82007a8..741f301 100644 --- a/Makefile +++ b/Makefile @@ -6,25 +6,25 @@ PREFIX ?= /usr/local BINDIR ?= bin MANDIR ?= share/man -all: soju sojuctl doc/soju.1 +all: suika suikactl doc/suika.1 -soju: - $(GO) build $(GOFLAGS) ./cmd/soju -sojuctl: - $(GO) build $(GOFLAGS) ./cmd/sojuctl -soju-znc-import: - $(GO) build $(GOFLAGS) ./cmd/soju-znc-import -doc/soju.1: doc/soju.1.scd - $(SCDOC) doc/soju.1 +suika: + $(GO) build $(GOFLAGS) ./cmd/suika +suikactl: + $(GO) build $(GOFLAGS) ./cmd/suikactl +suika-znc-import: + $(GO) build $(GOFLAGS) ./cmd/suika-znc-import +doc/suika.1: doc/suika.1.scd + $(SCDOC) doc/suika.1 clean: - $(RM) -f soju sojuctl doc/soju.1 + $(RM) -f suika suikactl doc/suika.1 install: mkdir -p $(DESTDIR)$(PREFIX)/$(BINDIR) mkdir -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - mkdir -p $(DESTDIR)/etc/soju - mkdir -p $(DESTDIR)/var/lib/soju - cp -f soju sojuctl $(DESTDIR)$(PREFIX)/$(BINDIR) - cp -f doc/soju.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - [ -f $(DESTDIR)/etc/soju/config ] || cp -f config.in $(DESTDIR)/etc/soju/config + mkdir -p $(DESTDIR)/etc/suika + mkdir -p $(DESTDIR)/var/lib/suika + cp -f suika suikactl $(DESTDIR)$(PREFIX)/$(BINDIR) + cp -f doc/suika.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 + [ -f $(DESTDIR)/etc/suika/config ] || cp -f config.in $(DESTDIR)/etc/suika/config -.PHONY: soju sojuctl soju-znc-import clean install +.PHONY: suika suikactl suika-znc-import clean install diff --git a/README.md b/README.md index a31f978..ce51f73 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# [soju] +# suika -[![builds.sr.ht status](https://builds.sr.ht/~emersion/soju/commits.svg)](https://builds.sr.ht/~emersion/soju/commits?) - -A user-friendly IRC bouncer. +A user-friendly IRC bouncer. Hard-fork of the 0.3 series of [soju](https://soju.im), named after [Suika Ibuki](https://en.touhouwiki.net/wiki/Suika_Ibuki) from [Touhou 7.5: Immaterial and Missing Power](https://en.touhouwiki.net/wiki/Immaterial_and_Missing_Power) - Multi-user - Support multiple clients for a single user, with proper backlog @@ -10,11 +8,6 @@ A user-friendly IRC bouncer. - Support connecting to multiple upstream servers via a single IRC connection to the bouncer -## Usage - -* [Getting started] -* [Man page] - ## Building and installing Dependencies: @@ -27,27 +20,16 @@ Dependencies: For end users, a `Makefile` is provided: make - sudo make install + doas make install -For development, you can use `go run ./cmd/soju` as usual. +For development, you can use `go run ./cmd/suika` as usual. To link with the system libsqlite3, set `GOFLAGS="-tags=libsqlite3"`. -## Contributing - -Send patches on the [mailing list] or on [GitHub], report bugs on the -[issue tracker]. Discuss in [#soju on Libera Chat][IRC channel]. - ## License AGPLv3, see LICENSE. Copyright (C) 2020 The soju Contributors +Copyright (C) 2023-present Aoi K. -[soju]: https://soju.im -[Getting started]: doc/getting-started.md -[Man page]: https://soju.im/doc/soju.1.html -[mailing list]: https://lists.sr.ht/~emersion/soju-dev -[GitHub]: https://github.com/emersion/soju -[issue tracker]: https://todo.sr.ht/~emersion/soju -[IRC channel]: ircs://irc.libera.chat/#soju diff --git a/cmd/soju-znc-import/main.go b/cmd/suika-znc-import/main.go similarity index 99% rename from cmd/soju-znc-import/main.go rename to cmd/suika-znc-import/main.go index a865516..02cf08a 100644 --- a/cmd/soju-znc-import/main.go +++ b/cmd/suika-znc-import/main.go @@ -12,8 +12,8 @@ import ( "strings" "unicode" - "git.chaotic.ninja/koizumi.aoi/soju-retro" - "git.chaotic.ninja/koizumi.aoi/soju-retro/config" + "git.chaotic.ninja/koizumi.aoi/suika" + "git.chaotic.ninja/koizumi.aoi/suika/config" ) const usage = `usage: soju-znc-import [options...] diff --git a/cmd/soju/main.go b/cmd/suika/main.go similarity index 98% rename from cmd/soju/main.go rename to cmd/suika/main.go index cdb1c8d..ea49a68 100644 --- a/cmd/soju/main.go +++ b/cmd/suika/main.go @@ -22,8 +22,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "git.chaotic.ninja/koizumi.aoi/soju-retro" - "git.chaotic.ninja/koizumi.aoi/soju-retro/config" + "git.chaotic.ninja/koizumi.aoi/suika" + "git.chaotic.ninja/koizumi.aoi/suika/config" ) // TCP keep-alive interval for downstream TCP connections diff --git a/cmd/sojuctl/main.go b/cmd/suikactl/main.go similarity index 97% rename from cmd/sojuctl/main.go rename to cmd/suikactl/main.go index 003aae4..64aa160 100644 --- a/cmd/sojuctl/main.go +++ b/cmd/suikactl/main.go @@ -9,8 +9,8 @@ import ( "log" "os" - "git.chaotic.ninja/koizumi.aoi/soju-retro" - "git.chaotic.ninja/koizumi.aoi/soju-retro/config" + "git.chaotic.ninja/koizumi.aoi/suika" + "git.chaotic.ninja/koizumi.aoi/suika/config" "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/ssh/terminal" ) diff --git a/go.mod b/go.mod index b355277..e6a4538 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.chaotic.ninja/koizumi.aoi/soju-retro +module git.chaotic.ninja/koizumi.aoi/suika go 1.15 diff --git a/server.go b/server.go index 78a7f83..b86c027 100644 --- a/server.go +++ b/server.go @@ -19,7 +19,7 @@ import ( "gopkg.in/irc.v3" "nhooyr.io/websocket" - "git.chaotic.ninja/koizumi.aoi/soju-retro/config" + "git.chaotic.ninja/koizumi.aoi/suika/config" ) // TODO: make configurable