shithub: hugo

Download patch

ref: 13d53b31f19240879122d6b7e4aaeb60b5130a3c
parent: 51dd462c3958f7cf032b06503f1f200a6aceebb9
author: Bjørn Erik Pedersen <[email protected]>
date: Sun Jan 14 15:08:28 EST 2018 

commands: Remove superflous BuildDate logic

Fixes #4272


--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -144,12 +144,6 @@
   version = "v1.1.0"
 
 [[projects]]
-  branch = "master"
-  name = "github.com/kardianos/osext"
-  packages = ["."]
-  revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
-
-[[projects]]
   name = "github.com/kyokomi/emoji"
   packages = ["."]
   revision = "7e06b236c489543f53868841f188a294e3383eab"
@@ -369,6 +363,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "7259b4caf8e75db0b809f06d4897dc870261252e3aecd68ea1348c87a5da9d50"
+  inputs-digest = "823d540219fd336b3a959879fa0018af2a047bd9ffd7d17e44dab15cf76cdc72"
   solver-name = "gps-cdcl"
   solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -53,10 +53,6 @@
   version = "1.1.0"
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/kardianos/osext"
-
-[[constraint]]
   name = "github.com/kyokomi/emoji"
   version = "1.5.0"
 
--- a/commands/version.go
+++ b/commands/version.go
@@ -14,15 +14,11 @@
 package commands
 
 import (
-	"os"
-	"path/filepath"
 	"runtime"
 	"strings"
-	"time"
 
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/kardianos/osext"
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 )
@@ -38,43 +34,9 @@
 }
 
 func printHugoVersion() {
-	if hugolib.BuildDate == "" {
-		setBuildDate() // set the build date from executable's mdate
-	} else {
-		formatBuildDate() // format the compile time
-	}
 	if hugolib.CommitHash == "" {
 		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
 	} else {
 		jww.FEEDBACK.Printf("Hugo Static Site Generator v%s-%s %s/%s BuildDate: %s\n", helpers.CurrentHugoVersion, strings.ToUpper(hugolib.CommitHash), runtime.GOOS, runtime.GOARCH, hugolib.BuildDate)
 	}
-}
-
-// setBuildDate checks the ModTime of the Hugo executable and returns it as a
-// formatted string.  This assumes that the executable name is Hugo, if it does
-// not exist, an empty string will be returned.  This is only called if the
-// hugolib.BuildDate wasn't set during compile time.
-//
-// osext is used for cross-platform.
-func setBuildDate() {
-	fname, _ := osext.Executable()
-	dir, err := filepath.Abs(filepath.Dir(fname))
-	if err != nil {
-		jww.ERROR.Println(err)
-		return
-	}
-	fi, err := os.Lstat(filepath.Join(dir, filepath.Base(fname)))
-	if err != nil {
-		jww.ERROR.Println(err)
-		return
-	}
-	t := fi.ModTime()
-	hugolib.BuildDate = t.Format(time.RFC3339)
-}
-
-// formatBuildDate formats the hugolib.BuildDate according to the value in
-// .Params.DateFormat, if it's set.
-func formatBuildDate() {
-	t, _ := time.Parse("2006-01-02T15:04:05-0700", hugolib.BuildDate)
-	hugolib.BuildDate = t.Format(time.RFC3339)
 }