dispatch binary extensions directly

nate smith · nate smith · commit 42ce8faafa85 · 2021-10-19T14:25:33.000-05:00
diff --git a/pkg/cmd/extension/extension.go b/pkg/cmd/extension/extension.go
@@ -48,3 +48,7 @@ func (e *Extension) UpdateAvailable() bool {
 	}
 	return true
 }
+
+func (e *Extension) IsBinary() bool {
+	return e.kind == BinaryKind
+}
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -69,9 +69,11 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 	forwardArgs := args[1:]
 
 	exts, _ := m.list(false)
+	var ext Extension
 	for _, e := range exts {
 		if e.Name() == extName {
-			exe = e.Path()
+			ext = e
+			exe = ext.Path()
 			break
 		}
 	}
@@ -81,7 +83,9 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 
 	var externalCmd *exec.Cmd
 
-	if runtime.GOOS == "windows" {
+	if ext.IsBinary() {
+		externalCmd = m.newCommand(exe, forwardArgs...)
+	} else if runtime.GOOS == "windows" {
 		// Dispatch all extension calls through the `sh` interpreter to support executable files with a
 		// shebang line on Windows.
 		shExe, err := m.findSh()
diff --git a/pkg/extensions/extension.go b/pkg/extensions/extension.go
@@ -13,6 +13,7 @@ type Extension interface {
 	URL() string
 	IsLocal() bool
 	UpdateAvailable() bool
+	IsBinary() bool
 }
 
 //go:generate moq -rm -out manager_mock.go . ExtensionManager
diff --git a/pkg/extensions/extension_mock.go b/pkg/extensions/extension_mock.go

Original file line number	Diff line number	Diff line change
`@@ -48,3 +48,7 @@ func (e *Extension) UpdateAvailable() bool {`
`48`	`48`	`}`
`49`	`49`	`return true`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+func (e *Extension) IsBinary() bool {`
	`53`	`+ return e.kind == BinaryKind`
	`54`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ type Extension interface {`
`13`	`13`	`URL() string`
`14`	`14`	`IsLocal() bool`
`15`	`15`	`UpdateAvailable() bool`
	`16`	`+ IsBinary() bool`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`//go:generate moq -rm -out manager_mock.go . ExtensionManager`