Handle GO15VENDOREXPERIMENT flag for >=Go 1.6
diff --git a/action/ensure.go b/action/ensure.go index c57bbac..e06f44b 100644 --- a/action/ensure.go +++ b/action/ensure.go
@@ -48,7 +48,13 @@ msg.Warn("You must install the Go 1.5 or greater toolchain to work with Glide.\n") os.Exit(1) } - if os.Getenv("GO15VENDOREXPERIMENT") != "1" { + + // This works with 1.5 and >=1.6. + cmd = exec.Command("go", "env", "GO15VENDOREXPERIMENT") + if out, err := cmd.CombinedOutput(); err != nil { + msg.Error("Error looking for $GOVENDOREXPERIMENT: %s.\n", err) + os.Exit(1) + } else if strings.TrimSpace(string(out)) != "1" { msg.Warn("To use Glide, you must set GO15VENDOREXPERIMENT=1\n") os.Exit(1) }