もっと頑張れよ、魔理沙

git-svn-id: file:///srv/svn/repo/marisa/trunk@69 d6811dac-2434-b64a-9ddc-f563ab233461
This commit is contained in:
yakumo.izuru 2025-04-18 17:17:48 +00:00
parent 7dd0415885
commit 65ffd37fbe
9 changed files with 14 additions and 21 deletions

View File

@ -1,5 +1,5 @@
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
purpose with or without fee is hereby granted, provided that the above

View File

@ -1 +1 @@
COPYING
COPYING

View File

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

View File

@ -10,7 +10,7 @@ import (
"os/signal"
"syscall"
"marisa.chaotic.ninja/marisa"
"mahou-no-mori.yakumo.dev/marisa"
)
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

View File

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

View File

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

View File

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

View File

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