Allow specifying executable in artifact section and skip bash from WSL

bundle/config/artifact.go

@@ -42,6 +42,8 @@ type Artifact struct {
 	Files        []ArtifactFile `json:"files,omitempty"`
 	BuildCommand string         `json:"build,omitempty"`
 
+	Executable exec.ExecutableType `json:"executable,omitempty"`
+
 	paths.Paths
 }
 
@@ -50,7 +52,13 @@ func (a *Artifact) Build(ctx context.Context) ([]byte, error) {
 		return nil, fmt.Errorf("no build property defined")
 	}
 
-	e, err := exec.NewCommandExecutor(a.Path)
+	var e *exec.Executor
+	var err error
+	if a.Executable != "" {
+		e, err = exec.NewCommandExecutorWithExecutable(a.Path, a.Executable)
+	} else {
+		e, err = exec.NewCommandExecutor(a.Path)
+	}
 	if err != nil {
 		return nil, err
 	}

libs/exec/exec.go

@@ -2,11 +2,24 @@ package exec
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"os"
 	osexec "os/exec"
 )
 
+type ExecutableType string
+
+const BashExecutable ExecutableType = `bash`
+const ShExecutable ExecutableType = `sh`
+const CmdExecutable ExecutableType = `cmd`
+
+var finders map[ExecutableType](func() (shell, error)) = map[ExecutableType](func() (shell, error)){
+	BashExecutable: newBashShell,
+	ShExecutable:   newShShell,
+	CmdExecutable:  newCmdShell,
+}
+
 type Command interface {
 	// Wait for command to terminate. It must have been previously started.
 	Wait() error
@@ -61,6 +74,22 @@ func NewCommandExecutor(dir string) (*Executor, error) {
 	}, nil
 }
 
+func NewCommandExecutorWithExecutable(dir string, execType ExecutableType) (*Executor, error) {
+	f, ok := finders[execType]
+	if !ok {
+		return nil, fmt.Errorf("%s is not supported as an artifact executable", execType)
+	}
+	shell, err := f()
+	if err != nil {
+		return nil, err
+	}
+
+	return &Executor{
+		shell: shell,
+		dir:   dir,
+	}, nil
+}
+
 func (e *Executor) StartCommand(ctx context.Context, command string) (Command, error) {
 	ec, err := e.shell.prepare(command)
 	if err != nil {