From 43c188c1eba1da587202a28a8fff50e483682600 Mon Sep 17 00:00:00 2001 From: NotZippy Date: Tue, 2 Oct 2018 08:00:38 -0700 Subject: [PATCH] Added missing environment variables to command, skipping the gopath --- revel/new.go | 17 ++++++++++++----- utils/command.go | 9 ++++++++- version.go | 4 ++-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/revel/new.go b/revel/new.go index 96e4fdda..97cc43b1 100644 --- a/revel/new.go +++ b/revel/new.go @@ -307,20 +307,27 @@ const ( # [[override]] # name = "github.com/x/y" # version = "2.4.0" -required = ["github.com/revel/cmd/revel"] +required = ["github.com/revel/revel", "github.com/revel/modules"] + +# Note to use a specific version changes this to +# +# [[override]] +# version = "0.20.1" +# name = "github.com/revel/modules" [[override]] branch = "master" name = "github.com/revel/modules" +# Note to use a specific version changes this to +# +# [[override]] +# version = "0.20.0" +# name = "github.com/revel/revel" [[override]] branch = "master" name = "github.com/revel/revel" -[[override]] - branch = "master" - name = "github.com/revel/cmd" - [[override]] branch = "master" name = "github.com/revel/log15" diff --git a/utils/command.go b/utils/command.go index 29b76cee..5871ebb4 100644 --- a/utils/command.go +++ b/utils/command.go @@ -12,7 +12,14 @@ func CmdInit(c *exec.Cmd, basePath string) { c.Dir = basePath // Go 1.8 fails if we do not include the GOROOT c.Env = []string{"GOPATH=" + build.Default.GOPATH, "PATH=" + GetEnv("PATH"), "GOROOT="+ GetEnv("GOROOT")} - + // Fetch the rest of the env variables + for _, e := range os.Environ() { + pair := strings.Split(e, "=") + if pair[0]=="GOPATH" { + continue + } + c.Env = append(c.Env,e) + } } // Returns an environment variable diff --git a/version.go b/version.go index 3450feb4..c4793c70 100644 --- a/version.go +++ b/version.go @@ -6,10 +6,10 @@ package cmd const ( // Version current Revel Command version - Version = "0.20.1" + Version = "0.20.2" // BuildDate latest commit/release date - BuildDate = "2018-09-30" + BuildDate = "2018-10-02" // MinimumGoVersion minimum required Go version for Revel MinimumGoVersion = ">= go1.8"