From db0d847e03cc94323b4db3f41d6f8b174bb6ec4a Mon Sep 17 00:00:00 2001
From: Andrey Nering <andrey.nering@gmail.com>
Date: Sat, 28 Apr 2018 15:36:01 -0300
Subject: [PATCH] Fix compilation after updating mvdan/sh

---
 internal/execext/exec.go | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/internal/execext/exec.go b/internal/execext/exec.go
index 9e6ebb46..f86003bb 100644
--- a/internal/execext/exec.go
+++ b/internal/execext/exec.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"io"
+	"os"
 	"strings"
 
 	"mvdan.cc/sh/interp"
@@ -37,10 +38,19 @@ func RunCommand(opts *RunCommandOptions) error {
 		return err
 	}
 
+	environ := opts.Env
+	if len(environ) == 0 {
+		environ = os.Environ()
+	}
+	env, err := interp.EnvFromList(environ)
+	if err != nil {
+		return err
+	}
+
 	r := interp.Runner{
 		Context: opts.Context,
 		Dir:     opts.Dir,
-		Env:     opts.Env,
+		Env:     env,
 
 		Exec: interp.DefaultExec,
 		Open: interp.OpenDevImpls(interp.DefaultOpen),