Merge pull request #51 from noborus/fix-verison-print

Fixed so that version is output correctly
noborus · Mar 1, 2024 · 1dade73 · 1dade73
2 parents 4a9d08c + 05d2322
commit 1dade73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,8 +6,8 @@ builds:
     id: ovcs-linux
     binary: ovcs
     ldflags:
-      - -X main.Version={{.Version}}
-      - -X main.Revision={{.ShortCommit}}
+      - -X github.com/noborus/ovcs/cmd.Version={{.Version}}
+      - -X github.com/noborus/ovcs/cmd.Revision={{.ShortCommit}}
     env:
       - CGO_ENABLED=0
     goos:
@@ -20,8 +20,8 @@ builds:
     id: ovcs-other
     binary: ovcs
     ldflags:
-      - -X main.Version={{.Version}}
-      - -X main.Revision={{.ShortCommit}}
+      - -X github.com/noborus/ovcs/cmd.Version={{.Version}}
+      - -X github.com/noborus/ovcs/cmd.Revision={{.ShortCommit}}
     env:
       - CGO_ENABLED=0
     goos:

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY_NAME := ovcs
 SRCS := $(shell git ls-files '*.go')
-LDFLAGS := "-X main.Version=$(shell git describe --tags --abbrev=0 --always) -X main.Revision=$(shell git rev-parse --verify --short HEAD)"
+LDFLAGS := "-X github.com/noborus/ovcs/cmd.Version=$(shell git describe --tags --abbrev=0 --always) -X github.com/noborus/ovcs/cmd.Revision=$(shell git rev-parse --verify --short HEAD)"
 
 all: build
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -24,8 +24,9 @@ var cfgFile string
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "ovcs",
-	Short: "The client/server of the terminal pager ov",
+	Use:     "ovcs",
+	Version: fmt.Sprintf("%s (rev: %s)", Version, Revision),
+	Short:   "The client/server of the terminal pager ov",
 	Long: `This is the client/server method version of terminal pager ov.
 Pipe to client to be displayed on server.`,
 }