yakumo.izuru/suika
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename to suika

Browse Source 
Signed-off-by: Aoi K <koizumi.aoi@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/suika/trunk@801 f0ae65fe-ee39-954e-97ec-027ff2717ef4
This commit is contained in:
koizumi.aoi 2023-03-21 03:00:04 +00:00
parent 730917adc3
commit 56f5116d21
7 changed files with 29 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -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.scd >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.scd >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

28
README.md
View File

@ -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

4
cmd/soju-znc-import/main.go → cmd/suika-znc-import/main.go
View File

@ -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...] <znc config path>

4
cmd/soju/main.go → cmd/suika/main.go
View File

@ -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

4
cmd/sojuctl/main.go → cmd/suikactl/main.go
View File

@ -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"
)

2
go.mod
View File

@ -1,4 +1,4 @@
module git.chaotic.ninja/koizumi.aoi/soju-retro
module git.chaotic.ninja/koizumi.aoi/suika
go 1.15

2
server.go
View File

@ -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