2
2
mirror of https://github.com/octoleo/restic.git synced 2024-11-23 13:17:42 +00:00

Merge pull request #704 from restic/remove-timestamp

Remove timestamp from `version` command
This commit is contained in:
Alexander Neumann 2016-12-19 22:22:43 +01:00
commit b0997d05fb
3 changed files with 3 additions and 8 deletions

View File

@ -12,7 +12,6 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
"time"
) )
var ( var (
@ -33,8 +32,6 @@ var config = struct {
Tests: []string{"restic/...", "cmds/..."}, // tests to run Tests: []string{"restic/...", "cmds/..."}, // tests to run
} }
const timeFormat = "2006-01-02 15:04:05"
// specialDir returns true if the file begins with a special character ('.' or '_'). // specialDir returns true if the file begins with a special character ('.' or '_').
func specialDir(name string) bool { func specialDir(name string) bool {
if name == "." { if name == "." {
@ -392,8 +389,7 @@ func main() {
output := filepath.Join(cwd, outputFilename) output := filepath.Join(cwd, outputFilename)
version := getVersion() version := getVersion()
compileTime := time.Now().Format(timeFormat) constants := Constants{}
constants := Constants{`main.compiledAt`: compileTime}
if version != "" { if version != "" {
constants["main.version"] = version constants["main.version"] = version
} }

View File

@ -15,8 +15,8 @@ The "version" command prints detailed information about the build environment
and the version of this software. and the version of this software.
`, `,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
fmt.Printf("restic %s\ncompiled at %s with %v on %v/%v\n", fmt.Printf("restic %s\ncompiled with %v on %v/%v\n",
version, compiledAt, runtime.Version(), runtime.GOOS, runtime.GOARCH) version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
}, },
} }

View File

@ -26,7 +26,6 @@ import (
) )
var version = "compiled manually" var version = "compiled manually"
var compiledAt = "unknown time"
func parseEnvironment(cmd *cobra.Command, args []string) { func parseEnvironment(cmd *cobra.Command, args []string) {
repo := os.Getenv("RESTIC_REPOSITORY") repo := os.Getenv("RESTIC_REPOSITORY")