luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #494 from epankala/version

Browse source 
Update to 'consul version' behaviour
This commit is contained in:
Armon Dadgar 2014-11-24 11:03:00 -08:00
parent b00ac0f2a3 b733df334b
commit 52f68c528f
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
commands.go
View file

@ -94,10 +94,20 @@ func init() {
}, },
"version": func() (cli.Command, error) { "version": func() (cli.Command, error) {
ver := ""
rel := ""
if len(GitDescribe) == 0 {
ver = Version
rel = "dev"
} else {
ver = GitDescribe
rel = VersionPrerelease
}
return &command.VersionCommand{ return &command.VersionCommand{
Revision: GitCommit, Revision: GitCommit,
Version: GitDescribe, Version: ver,
VersionPrerelease: VersionPrerelease, VersionPrerelease: rel,
Ui: ui, Ui: ui,
}, nil }, nil
}, },