Return script output on error (#3)

siderolabs · Jun 5, 2017 · 81055ed · 81055ed
1 parent 426abe1
commit 81055ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/conform.yaml b/conform.yaml
@@ -50,6 +50,10 @@ scripts:
     fi
 
   clean: |
+    #!/bin/bash
+
+    set -e
+
     cat .gitignore | while read line; do rm -rf "$line"; done
     dep ensure
     dep prune

diff --git a/conform/enforce.go b/conform/enforce.go
@@ -123,13 +123,9 @@ func (e *Enforcer) ExtractArtifact(artifact string) error {
 func (e *Enforcer) ExecuteScript(script string) error {
 	if s, ok := e.config.Scripts[script]; ok {
 		log.Printf("Running %s script", script)
-		command := exec.Command("bash", "-c", s)
-		command.Stdout = os.Stdout
-		command.Stderr = os.Stderr
-		command.Start()
-		err := command.Wait()
+		out, err := exec.Command("bash", "-c", s).Output()
 		if err != nil {
-			return err
+			return fmt.Errorf("Failed executing %s: %v\n%s", script, err, out)
 		}
 
 		return nil