diff options
author | Austin Ziegler <austin@zieglers.ca> | 2014-12-05 23:11:43 -0500 |
---|---|---|
committer | bep <bjorn.erik.pedersen@gmail.com> | 2014-12-08 21:41:30 +0100 |
commit | 27840932a5da2a9ccb6ed486c1c27afb3347f2b1 (patch) | |
tree | 03885b1136d2902a15fa08c918265f88f4df7e73 /commands/version.go | |
parent | a0d956c2ad7371d989fc192e122f0097b07a5b01 (diff) |
Always use RFC3339 for version date format.
Fixes #695 reported by @synful.
- No longer tries to load a configuration.
- Because of this the version tests are no longer necessary.
Diffstat (limited to 'commands/version.go')
-rw-r--r-- | commands/version.go | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/commands/version.go b/commands/version.go index b38393357..0fdffba14 100644 --- a/commands/version.go +++ b/commands/version.go @@ -22,7 +22,6 @@ import ( "bitbucket.org/kardianos/osext" "github.com/spf13/cobra" - "github.com/spf13/viper" ) var timeLayout string // the layout for time.Time @@ -37,7 +36,6 @@ var version = &cobra.Command{ Short: "Print the version number of Hugo", Long: `All software has versions. This is Hugo's`, Run: func(cmd *cobra.Command, args []string) { - InitializeConfig() if buildDate == "" { setBuildDate() // set the build date from executable's mdate } else { @@ -70,39 +68,12 @@ func setBuildDate() { return } t := fi.ModTime() - buildDate = t.Format(getDateFormat()) + buildDate = t.Format(time.RFC3339) } // formatBuildDate formats the buildDate according to the value in // .Params.DateFormat, if it's set. func formatBuildDate() { t, _ := time.Parse("2006-01-02T15:04:05", buildDate) - buildDate = t.Format(getDateFormat()) -} - -// getDateFormat gets the dateFormat value from Params. The dateFormat should -// be a valid time layout. If it isn't set, time.RFC3339 is used. -func getDateFormat() string { - params := viper.Get("params") - if params == nil { - return time.RFC3339 - } - - // var typMapIfaceIface = reflect.TypeOf(map[interface{}{}]interface{}{}) - // var typMapStringIface = reflect.TypeOf(map[string]interface{}{}) - parms := map[string]interface{}{} - switch params.(type) { - case map[interface{}]interface{}: - for k, v := range params.(map[interface{}]interface{}) { - parms[k.(string)] = v - } - case map[string]interface{}: - parms = params.(map[string]interface{}) - } - - layout := parms["DateFormat"] - if layout == nil || layout == "" { - return time.RFC3339 - } - return layout.(string) + buildDate = t.Format(time.RFC3339) } |