Use syscall.Exec() on unix (#3)

rungo.go

@@ -6,24 +6,12 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"os/exec"
 	"path/filepath"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/pkg/errors"
 )
 
-func runGo(binary, baseDir string, args []string) error {
-	goBinary := filepath.Join(baseDir, "go", "bin", binary)
-	cmd := exec.Command(goBinary, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-
-	log.Debugf("Executing %q with arguments %v", goBinary, args)
-	return cmd.Run()
-}
-
 // Get the requested version, either from env variable or go-version file
 func findVersion() string {
 	envVersion := findEnvVersion()

rungo_unix.go

@@ -8,11 +8,21 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"syscall"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/pkg/errors"
 )
 
+func runGo(binary, baseDir string, args []string) error {
+	goBinary := filepath.Join(baseDir, "go", "bin", binary)
+	binaryWithArgs := append([]string{goBinary}, args...)
+
+	log.Debugf("Executing %q with arguments %v", goBinary, args)
+	// generally won't return
+	return syscall.Exec(goBinary, binaryWithArgs, os.Environ())
+}
+
 func extractFile(golangArchive, baseDir string) error {
 	log.Debugf("Extracting %q", golangArchive)
 	err := os.MkdirAll(baseDir, os.ModeDir|0755)

rungo_windows.go

@@ -4,12 +4,24 @@ import (
 	"archive/zip"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/pkg/errors"
 )
 
+func runGo(binary, baseDir string, args []string) error {
+	goBinary := filepath.Join(baseDir, "go", "bin", binary)
+	cmd := exec.Command(goBinary, args...)
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	log.Debugf("Executing %q with arguments %v", goBinary, args)
+	return cmd.Run()
+}
+
 func extractFile(golangArchive, baseDir string) error {
 	log.Debugf("Extracting %q", golangArchive)
 	err := os.MkdirAll(baseDir, os.ModeDir|0755)