mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-20 15:32:52 +00:00
Code Issues Releases Wiki Activity

Add a version command (#159)

Browse Source
This commit is contained in:
opsyne 2022-08-17 01:13:57 -07:00 committed by GitHub
parent 9275c9d3f3
commit 2c5b609319
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -5,12 +5,14 @@ PREFIX=/usr/local
BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/share/man
GO=go
TAGGED_RELEASE!=git describe --tags --abbrev=0
LDFLAGS=-X "github.com/bouncepaw/mycorrhiza/version.taggedRelease=$(TAGGED_RELEASE)"
all: mycorrhiza
mycorrhiza:
$(GO) generate $(GOFLAGS)
CGO_ENABLED=0 $(GO) build $(GOFLAGS) -o mycorrhiza .
CGO_ENABLED=0 $(GO) build -ldflags="$(LDFLAGS)" $(GOFLAGS) -o mycorrhiza .
install:
mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1

8
flag.go
View File

@ -13,6 +13,7 @@ import (
"github.com/bouncepaw/mycorrhiza/cfg"
"github.com/bouncepaw/mycorrhiza/files"
"github.com/bouncepaw/mycorrhiza/user"
"github.com/bouncepaw/mycorrhiza/version"
"golang.org/x/term"
)
@ -31,12 +32,19 @@ func printHelp() {
// parseCliArgs parses CLI options and sets several important global variables. Call it early.
func parseCliArgs() {
var createAdminName string
var versionFlag bool
flag.StringVar(&cfg.ListenAddr, "listen-addr", "", "Address to listen on. For example, 127.0.0.1:1737 or /run/mycorrhiza.sock.")
flag.StringVar(&createAdminName, "create-admin", "", "Create a new admin. The password will be prompted in the terminal.")
flag.BoolVar(&versionFlag, "version", false, "Print version information and exit.")
flag.Usage = printHelp
flag.Parse()
if versionFlag {
fmt.Println(version.FormatVersion())
os.Exit(0)
}
args := flag.Args()
if len(args) == 0 {
log.Fatal("error: pass a wiki directory")

32
version/version.go Normal file
View File

@ -0,0 +1,32 @@
package version
import (
"fmt"
"runtime/debug"
"strconv"
)
// This is set through ldflags='-X ...' in the Makefile
var taggedRelease string = "Unknown"
func FormatVersion() string {
var commitHash string = "Unknown"
var dirty string = ""
info, ok := debug.ReadBuildInfo()
if ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
commitHash = setting.Value
} else if setting.Key == "vcs.modified" {
modified, err := strconv.ParseBool(setting.Value)
if err == nil && modified {
dirty = "-dirty"
}
}
}
}
return fmt.Sprintf("Mycorrhiza Wiki %s+%s%s", taggedRelease, commitHash[:7], dirty)
}