diff --git a/Makefile b/Makefile index 2ad6da2..c4e8331 100755 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ SYSDDIR=${SYSDDIR_:/%=%} DESTDIR:= PREFIX:=/usr/local -VERSION=24.27.0 +VERSION?=24.27.0 FLAGS:=-buildmode=pie -modcacherw -mod=readonly -trimpath -LDFLAGS=-ldflags "-s -w -X main.version=${VERSION}" -tags osusergo,netgo +LDFLAGS=-ldflags "-s -w -X 'git.arav.su/Arav/dwelling-home/internal/version.ver=v${VERSION}'" -tags osusergo,netgo .PHONY: run install uninstall clean diff --git a/cmd/dwelling-home/main.go b/cmd/dwelling-home/main.go index e86a1e7..fce1697 100644 --- a/cmd/dwelling-home/main.go +++ b/cmd/dwelling-home/main.go @@ -12,6 +12,7 @@ import ( "time" dwhttp "git.arav.su/Arav/dwelling-home/internal/http" + "git.arav.su/Arav/dwelling-home/internal/version" mfsqlite "git.arav.su/Arav/dwelling-home/pkg/mindflow/database/sqlite" "git.arav.su/Arav/dwelling-home/web" "git.arav.su/Arav/httpr" @@ -19,8 +20,6 @@ import ( "github.com/a-h/templ" ) -var version string - var ( showVersion = flag.Bool("v", false, "show version") listenAddress = flag.String("listen", "/var/run/dwelling-home/sock", "listen address (ip:port|unix_path)") @@ -34,7 +33,7 @@ func main() { flag.Parse() if *showVersion { - fmt.Println("dwelling-home Ver.", version, "\nCopyright (c) 2023 Alexander \"Arav\" Andreev ") + fmt.Println("dwelling-home", version.GetVersion(), "\nCopyright (c) 2023,2024 Alexander \"Arav\" Andreev ") return } diff --git a/internal/version/version.go b/internal/version/version.go new file mode 100644 index 0000000..813d9e2 --- /dev/null +++ b/internal/version/version.go @@ -0,0 +1,7 @@ +package version + +var ver string + +func GetVersion() string { + return ver +}