Merge pull request #4314 from thaJeztah/remove_execabs

remove uses of golang.org/x/sys/execabs

cli-plugins/manager/candidate.go

@@ -1,8 +1,6 @@
 package manager
 
-import (
+import "os/exec"
-	exec "golang.org/x/sys/execabs"
-)
 
 // Candidate represents a possible plugin candidate, for mocking purposes
 type Candidate interface {

cli-plugins/manager/manager.go

@@ -3,6 +3,7 @@ package manager
 import (
 	"context"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -13,7 +14,6 @@ import (
 	"github.com/fvbommel/sortorder"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
-	exec "golang.org/x/sys/execabs"
 )
 
 // ReexecEnvvar is the name of an ennvar which is set to the command

cli/command/image/build/context.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -22,7 +23,6 @@ import (
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/patternmatcher"
 	"github.com/pkg/errors"
-	exec "golang.org/x/sys/execabs"
 )
 
 const (

cli/config/credentials/default_store.go

@@ -1,8 +1,6 @@
 package credentials
 
-import (
+import "os/exec"
-	exec "golang.org/x/sys/execabs"
-)
 
 // DetectDefaultStore return the default credentials store for the platform if
 // no user-defined store is passed, and the store executable is available.

cli/connhelper/commandconn/commandconn.go

@@ -20,6 +20,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"runtime"
 	"strings"
 	"sync"
@@ -28,7 +29,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	exec "golang.org/x/sys/execabs"
 )
 
 // New returns net.Conn