Commit5d896ae

committed

Print prettier version info

1 parent9b40934 commit5d896aeCopy full SHA for 5d896ae

File tree

+32

-11

lines changed

+32

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`builds:`
`2`	`2`	`-ldflags:`
`3`		`- --s -w -X github.com/khlieng/dispatch/commands.version=v{{.Version}} -X github.com/khlieng/dispatch/commands.commit={{.ShortCommit}} -X github.com/khlieng/dispatch/commands.date={{.Date}}`
	`3`	`+ --s -w -X github.com/khlieng/dispatch/version.Tag=v{{.Version}} -X github.com/khlieng/dispatch/version.Commit={{.ShortCommit}} -X github.com/khlieng/dispatch/version.Date={{.Date}}`
`4`	`4`
`5`	`5`	`env:`
`6`	`6`	`-CGO_ENABLED=0`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,11 @@ import (`
`13`	`13`	`"github.com/khlieng/dispatch/storage"`
`14`	`14`	`"github.com/khlieng/dispatch/storage/bleve"`
`15`	`15`	`"github.com/khlieng/dispatch/storage/boltdb"`
	`16`	`+"github.com/khlieng/dispatch/version"`
`16`	`17`	`"github.com/spf13/cobra"`
`17`	`18`	`"github.com/spf13/viper"`
`18`	`19`	`)`
`19`	`20`
`20`		`-var (`
`21`		`-version="dev"`
`22`		`-commit="none"`
`23`		`-date="unknown"`
`24`		`-)`
`25`		`-`
`26`	`21`	constlogo=`
`27`	`22`	`____ _ _ _`
`28`	`23`	`\| _ \ (_) ___ _ __ __ _ \| \|_ ___ \| \|__`
`@@ -42,7 +37,7 @@ var rootCmd = &cobra.Command{`
`42`	`37`	`Short:"Web-based IRC client in Go.",`
`43`	`38`	`PersistentPreRun:func(cmd*cobra.Command,args []string) {`
`44`	`39`	`ifcmd.Use=="dispatch" {`
`45`		`-fmt.Printf(logo,version,commit,date)`
	`40`	`+fmt.Printf(logo,version.Tag,version.Commit,version.Date)`
`46`	`41`	`}`
`47`	`42`
`48`	`43`	`storage.Initialize(viper.GetString("dir"))`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`
`3`		`-Import="github.com/khlieng/dispatch/commands"`
	`3`	`+Import="github.com/khlieng/dispatch/version"`
`4`	`4`
`5`		`-Version=$(git describe --tags)`
	`5`	`+Tag=$(git describe --tags)`
`6`	`6`	`Commit=$(git rev-parse --short HEAD)`
`7`	`7`	`Date=$(date +'%Y-%m-%dT%TZ')`
`8`	`8`
`9`		`-go install -ldflags"-s -w -X$Import.version=$Version -X$Import.commit=$Commit -X$Import.date=$Date"`
	`9`	`+go install -ldflags"-s -w -X$Import.Tag=$Tag -X$Import.Commit=$Commit -X$Import.Date=$Date"`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,26 @@`
	`1`	`+package version`
	`2`	`+`
	`3`	`+import (`
	`4`	`+"fmt"`
	`5`	`+"strings"`
	`6`	`+"time"`
	`7`	`+)`
	`8`	`+`
	`9`	`+var (`
	`10`	`+Tag="dev"`
	`11`	`+Commit="none"`
	`12`	`+Date="unknown"`
	`13`	`+)`
	`14`	`+`
	`15`	`+funcinit() {`
	`16`	`+vParts:=strings.Split(Tag,"-")`
	`17`	`+`
	`18`	`+iflen(vParts)>1 {`
	`19`	`+Tag=fmt.Sprintf("%s + %s commits",vParts[0],vParts[1])`
	`20`	`+}`
	`21`	`+`
	`22`	`+t,err:=time.Parse(time.RFC3339,Date)`
	`23`	`+iferr==nil {`
	`24`	`+Date=t.Format("02 Jan 2006, 15:04:05")`
	`25`	`+}`
	`26`	`+}`

Comments

(0)