Selaa lähdekoodia

No specific case for windows, always resolve binary name before executing command

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 vuotta sitten
vanhempi
sitoutus
41a1553dab
1 muutettua tiedostoa jossa 5 lisäystä ja 10 poistoa
  1. 5 10
      cli/mobycli/exec.go

+ 5 - 10
cli/mobycli/exec.go

@@ -22,7 +22,6 @@ import (
 	"os"
 	"os"
 	"os/exec"
 	"os/exec"
 	"os/signal"
 	"os/signal"
-	"runtime"
 	"strings"
 	"strings"
 
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
@@ -61,14 +60,10 @@ func mustDelegateToMoby(ctxType string) bool {
 
 
 // Exec delegates to com.docker.cli if on moby context
 // Exec delegates to com.docker.cli if on moby context
 func Exec(root *cobra.Command) {
 func Exec(root *cobra.Command) {
-	execBinary := ComDockerCli
-	if runtime.GOOS == "windows" { // workaround for windows issue https://github.com/golang/go/issues/38736
-		var err error
-		execBinary, err = LookPath(ComDockerCli)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
+	execBinary, err := LookPath(ComDockerCli)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
 	}
 	}
 	cmd := exec.Command(execBinary, os.Args[1:]...)
 	cmd := exec.Command(execBinary, os.Args[1:]...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdin = os.Stdin
@@ -93,7 +88,7 @@ func Exec(root *cobra.Command) {
 		}
 		}
 	}()
 	}()
 
 
-	err := cmd.Run()
+	err = cmd.Run()
 	childExit <- true
 	childExit <- true
 	if err != nil {
 	if err != nil {
 		metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
 		metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)