Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func RunCustom(args []string, commands map[string]cli.CommandFactory) int {
// just show the version.
for _, arg := range args {
if arg == "-v" || arg == "-version" || arg == "--version" {
newArgs := make([]string, len(args)+1)
newArgs := make([]string, len(args) + 1)
newArgs[0] = "version"
copy(newArgs[1:], args)
args = newArgs
Expand Down
19 changes: 13 additions & 6 deletions command/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,25 @@ import (
type VersionCommand struct {
Meta

Name string
Version string
Revision string
Name string
Revision string
Version string
BuildBy string
Tag string
}

func (c *VersionCommand) Run(args []string) int {
var versionString bytes.Buffer

fmt.Fprintf(&versionString, "%s version %s", c.Name, c.Version)
fmt.Fprintf(&versionString, "%s version ", c.Name, c.Version)
if c.Revision != "" {
fmt.Fprintf(&versionString, " (%s)", c.Revision)
fmt.Fprintf(&versionString, " Revision : %s", c.Revision)
}
if c.BuildBy != "" {
fmt.Fprintf(&versionString, " Build by : %s", c.BuildBy)
}
if c.Tag != "" {
fmt.Fprintf(&versionString, " Tag : %s", c.Tag)
}

c.Ui.Output(versionString.String())
Expand All @@ -28,7 +36,6 @@ func (c *VersionCommand) Run(args []string) int {
func (c *VersionCommand) Synopsis() string {
return fmt.Sprintf("Print %s version and quit", c.Name)
}

func (c *VersionCommand) Help() string {
return ""
}
7 changes: 5 additions & 2 deletions commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ func Commands(meta *command.Meta) map[string]cli.CommandFactory {
"version": func() (cli.Command, error) {
return &command.VersionCommand{
Meta: *meta,
Version: Version,
Revision: GitCommit,
Name: Name,
Revision: GitCommit,
Version: Version,
BuildBy: BuiltUser,
Tag: GitTag,

}, nil
},
}
Expand Down
2 changes: 2 additions & 0 deletions version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ const Version string = "0.1.0"
// This value is extracted by git command when building.
// To set this from outside, use go build -ldflags "-X main.GitCommit \"$(COMMIT)\""
var GitCommit string
var BuiltUser string
var GitTag string