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

Compare commits

base: yakumo.izuru:5a46596dd68fddd87209bcc6e33dfb529ee6e0ae
Branches Tags
yakumo.izuru:master
...
compare: yakumo.izuru:65ffd37fbede7e575d47d0f2d0403bc2c46b7141
Branches Tags
yakumo.izuru:master

No commits in common. "5a46596dd68fddd87209bcc6e33dfb529ee6e0ae" and "65ffd37fbede7e575d47d0f2d0403bc2c46b7141" have entirely different histories.
5a46596dd6 ... 65ffd37fbe

9 changed files with 14 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
COPYING
View File

@ -1,5 +1,5 @@
Copyright (c) 2021 Willy Goiffon <contact@z3bra.org> Copyright (c) 2021 Willy Goiffon <contact@z3bra.org>
Copyright (c) 2023-present Izuru Yakumo <postmaster@chaotic.ninja> Copyright (c) 2023-present Izuru Yakumo <eternal-servant@yakumo.dev>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above purpose with or without fee is hereby granted, provided that the above

2
LICENSE
View File

@ -1 +1 @@
COPYING COPYING

16
Makefile
View File

@ -1,25 +1,21 @@
GO ?= go GO ?= go
GOFLAGS ?= -v -ldflags "-w -X `go list`.Version=${VERSION} -X `go list`.Commit=${COMMIT} -X `go list`.Build=${BUILD}" GOFLAGS ?= -v -ldflags "-w -X `${GO} list`.Version=${VERSION}"
CGO ?= 0 CGO ?= 0
VERSION = `git describe --abbrev=0 --tags 2>/dev/null || echo "$VERSION"` VERSION = 2024.02.10
COMMIT = `git rev-parse --short HEAD || echo "$COMMIT"`
BRANCH = `git rev-parse --abbrev-ref HEAD`
BUILD = `git show -s --pretty=format:%cI`
PREFIX ?= /usr/local PREFIX ?= /usr/local
all: marisa marisa-trash all: marisa marisa-trash
marisa: marisa:
CGO_ENABLED=${CGO} go build ${GOFLAGS} ./cmd/marisa CGO_ENABLED=${CGO} ${GO} build ${GOFLAGS} ./cmd/marisa
marisa-trash: marisa-trash:
CGO_ENABLED=${CGO} go build ${GOFLAGS} ./cmd/marisa-trash CGO_ENABLED=${CGO} ${GO} build ${GOFLAGS} ./cmd/marisa-trash
clean: clean:
rm -f marisa marisa-trash rm -f marisa marisa-trash
install: install:
install -Dm0755 marisa ${PREFIX}/bin/marisa install -Dm0755 marisa ${PREFIX}/bin/marisa
install -Dm0755 marisa-trash ${PREFIX}/bin/marisa-trash install -Dm0755 marisa-trash ${PREFIX}/bin/marisa-trash
install -Dm0644 marisa.1 ${PREFIX}/share/man/man1/marisa.1 install -Dm0644 marisa.1 ${PREFIX}/man/man1/marisa.1
install -Dm0644 marisa.conf.5 ${PREFIX}/share/man/man5/marisa.conf.5 install -Dm0644 marisa.conf.5 ${PREFIX}/man/man5/marisa.conf.5
.PHONY: marisa marisa-trash .PHONY: marisa marisa-trash

2
cmd/marisa/main.go
View File

@ -10,7 +10,7 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"marisa.chaotic.ninja/marisa" "mahou-no-mori.yakumo.dev/marisa"
) )
type templatedata struct { type templatedata struct {

2
go.mod
View File

@ -1,4 +1,4 @@
module marisa.chaotic.ninja/marisa module mahou-no-mori.yakumo.dev/marisa
go 1.17 go 1.17

2
marisa-trash.1
View File

@ -41,4 +41,4 @@ Lookup metadata files in directory
.An Willy Goiffon Aq Mt dev@z3bra.org .An Willy Goiffon Aq Mt dev@z3bra.org
.Pp .Pp
"Borrowed" by "Borrowed" by
.An Izuru Yakumo Aq Mt yakumo.izuru@chaotic.ninja .An Izuru Yakumo Aq Mt eternal-servant@yakumo.dev

2
marisa.1
View File

@ -33,7 +33,7 @@ Load configuration from
.An Willy Goiffon Aq Mt dev@z3bra.org .An Willy Goiffon Aq Mt dev@z3bra.org
.Pp .Pp
"Borrowed" by "Borrowed" by
.An Izuru Yakumo Aq Mt yakumo.izuru@chaotic.ninja .An Izuru Yakumo Aq Mt eternal-servant@yakumo.dev
.Sh BUGS .Sh BUGS
If you upload a file through the browser, and refresh the If you upload a file through the browser, and refresh the
page, the file will get constantly reuploaded, which may page, the file will get constantly reuploaded, which may

2
marisa.conf.5
View File

@ -91,4 +91,4 @@ types { include "/usr/share/misc/mime.types" }
.An Willy Goiffon Aq Mt dev@z3bra.org .An Willy Goiffon Aq Mt dev@z3bra.org
.Pp .Pp
"Borrowed" by "Borrowed" by
.An Izuru Yakumo Aq Mt yakumo.izuru@chaotic.ninja .An Izuru Yakumo Aq Mt eternal-servant@yakumo.dev

5
version.go
View File

@ -7,12 +7,9 @@ import (
var ( var (
// Version release version // Version release version
Version = "0.0.1" Version = "0.0.1"
// Commit will be overwritten automatically by the build system
Commit = "HEAD"
) )
// FullVersion display the full version and build // FullVersion display the full version and build
func FullVersion() string { func FullVersion() string {
return fmt.Sprintf("%s@%s", Version, Commit) return fmt.Sprintf("%s", Version)
} }