review feedback

nate smith · nate smith · commit f65c1537dc37 · 2021-10-21T11:58:25.000-05:00
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -83,7 +83,7 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 
 	var externalCmd *exec.Cmd
 
-	if ext.IsBinary() {
+	if ext.IsBinary() || runtime.GOOS != "windows" {
 		externalCmd = m.newCommand(exe, forwardArgs...)
 	} else if runtime.GOOS == "windows" {
 		// Dispatch all extension calls through the `sh` interpreter to support executable files with a
@@ -97,8 +97,6 @@ func (m *Manager) Dispatch(args []string, stdin io.Reader, stdout, stderr io.Wri
 		}
 		forwardArgs = append([]string{"-c", `command "$@"`, "--", exe}, forwardArgs...)
 		externalCmd = m.newCommand(shExe, forwardArgs...)
-	} else {
-		externalCmd = m.newCommand(exe, forwardArgs...)
 	}
 	externalCmd.Stdin = stdin
 	externalCmd.Stdout = stdout
@@ -272,30 +270,30 @@ func (m *Manager) getLatestVersion(ext Extension) (string, error) {
 	if ext.isLocal {
 		return "", fmt.Errorf("unable to get latest version for local extensions")
 	}
-	if ext.kind == GitKind {
-		gitExe, err := m.lookPath("git")
+	if ext.IsBinary() {
+		repo, err := ghrepo.FromFullName(ext.url)
 		if err != nil {
 			return "", err
 		}
-		extDir := filepath.Dir(ext.path)
-		gitDir := "--git-dir=" + filepath.Join(extDir, ".git")
-		cmd := m.newCommand(gitExe, gitDir, "ls-remote", "origin", "HEAD")
-		lsRemote, err := cmd.Output()
+		r, err := fetchLatestRelease(m.client, repo)
 		if err != nil {
 			return "", err
 		}
-		remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
-		return string(remoteSha), nil
+		return r.Tag, nil
 	} else {
-		repo, err := ghrepo.FromFullName(ext.url)
+		gitExe, err := m.lookPath("git")
 		if err != nil {
 			return "", err
 		}
-		r, err := fetchLatestRelease(m.client, repo)
+		extDir := filepath.Dir(ext.path)
+		gitDir := "--git-dir=" + filepath.Join(extDir, ".git")
+		cmd := m.newCommand(gitExe, gitDir, "ls-remote", "origin", "HEAD")
+		lsRemote, err := cmd.Output()
 		if err != nil {
 			return "", err
 		}
-		return r.Tag, nil
+		remoteSha := bytes.SplitN(lsRemote, []byte("\t"), 2)[0]
+		return string(remoteSha), nil
 	}
 }
 
@@ -481,7 +479,7 @@ func (m *Manager) upgradeExtension(ext Extension, force bool) error {
 		return upToDateError
 	}
 	var err error
-	if ext.kind == BinaryKind {
+	if ext.IsBinary() {
 		err = m.upgradeBinExtension(ext)
 	} else {
 		err = m.upgradeGitExtension(ext, force)
