diff --git a/COPYING b/COPYING index 196d9bc..73958ac 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ Copyright (c) 2021 Willy Goiffon -Copyright (c) 2023-present Izuru Yakumo +Copyright (c) 2023-present Izuru Yakumo Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/LICENSE b/LICENSE index 5ecd9c6..d24842f 120000 --- a/LICENSE +++ b/LICENSE @@ -1 +1 @@ -COPYING +COPYING \ No newline at end of file diff --git a/Makefile b/Makefile index aac2610..6e58b82 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/cmd/marisa/main.go b/cmd/marisa/main.go index 0f74d7e..5d82b88 100644 --- a/cmd/marisa/main.go +++ b/cmd/marisa/main.go @@ -10,7 +10,7 @@ import ( "os/signal" "syscall" - "marisa.chaotic.ninja/marisa" + "mahou-no-mori.yakumo.dev/marisa" ) type templatedata struct { diff --git a/go.mod b/go.mod index d989832..e0f5ea0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module marisa.chaotic.ninja/marisa +module mahou-no-mori.yakumo.dev/marisa go 1.17 diff --git a/marisa-trash.1 b/marisa-trash.1 index 31a9ff8..3b35c73 100644 --- a/marisa-trash.1 +++ b/marisa-trash.1 @@ -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 diff --git a/marisa.1 b/marisa.1 index a45428e..f7f6efe 100644 --- a/marisa.1 +++ b/marisa.1 @@ -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 diff --git a/marisa.conf.5 b/marisa.conf.5 index 03c4d6e..cb87eec 100644 --- a/marisa.conf.5 +++ b/marisa.conf.5 @@ -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 diff --git a/version.go b/version.go index 611fd43..1853f25 100644 --- a/version.go +++ b/version.go @@ -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) }