From baf4cc225ea7a7ba8c998c97c92d68a61ebefeca Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 13 Oct 2014 20:13:42 +0200 Subject: [PATCH] Build without git --- build.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build.go b/build.go index 3d8cd61a3..526ce746e 100644 --- a/build.go +++ b/build.go @@ -35,6 +35,7 @@ import ( "runtime" "strconv" "strings" + "time" ) var ( @@ -301,7 +302,11 @@ func rmr(paths ...string) { } func getVersion() string { - v := run("git", "describe", "--always", "--dirty") + ecmd := exec.Command("git", "describe", "--always", "--dirty") + v, err := ecmd.CombinedOutput() + if err != nil { + return "unknown-dev" + } v = versionRe.ReplaceAllFunc(v, func(s []byte) []byte { s[0] = '+' return s @@ -310,7 +315,11 @@ func getVersion() string { } func buildStamp() int64 { - bs := run("git", "show", "-s", "--format=%ct") + ecmd := exec.Command("git", "show", "-s", "--format=%ct") + bs, err := ecmd.CombinedOutput() + if err != nil { + return time.Now().Unix() + } s, _ := strconv.ParseInt(string(bs), 10, 64) return s }