Merge remote-tracking branch 'origin/windows-fix'

Author: mislav

browser_linux.go

@@ -1,26 +1,23 @@
 package browser
 
 import (
-	"errors"
 	"os/exec"
+	"strings"
 )
 
 func openBrowser(url string) error {
-	browserPath, err := lookPath("xdg-open", "wslview")
-	if err != nil {
-		return err
-	}
-	return runCmd(browserPath, url)
-}
+	providers := []string{"xdg-open", "x-www-browser", "www-browser", "wslview"}
 
-func lookPath(cmdName, fallbackName string) (string, error) {
-	cmdPath, err := exec.LookPath(cmdName)
-	if errors.Is(err, exec.ErrNotFound) {
-		if wslPath, err := exec.LookPath(fallbackName); err == nil {
-			return wslPath, nil
+	// There are multiple possible providers to open a browser on linux
+	// One of them is xdg-open, another is x-www-browser, then there's www-browser, etc.
+	// Look for one that exists and run it
+	for _, provider := range providers {
+		if _, err := exec.LookPath(provider); err == nil {
+			return runCmd(provider, url)
 		}
 	}
-	return cmdPath, err
+
+	return &exec.Error{Name: strings.Join(providers, ","), Err: exec.ErrNotFound}
 }
 
 func setFlags(cmd *exec.Cmd) {}

browser_windows.go

@@ -1,22 +1,14 @@
+//go:generate mkwinsyscall -output zbrowser_windows.go browser_windows.go
+//sys shellExecute(hwnd int, verb string, file string, args string, cwd string, showCmd int) (err error) = shell32.ShellExecuteW
 package browser
 
-import (
-	"os/exec"
-	"strings"
-	"syscall"
+import "os/exec"
 
-	"github.com/cli/safeexec"
-)
+const sW_SHOWNORMAL = 1
 
 func openBrowser(url string) error {
-	cmdPath, err := safeexec.LookPath("cmd")
-	if err != nil {
-		return err
-	}
-	r := strings.NewReplacer("&", "^&")
-	return runCmd(cmdPath, "/c", "start", r.Replace(url))
+	return shellExecute(0, "", url, "", "", sW_SHOWNORMAL)
 }
 
 func setFlags(cmd *exec.Cmd) {
-	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
 }

go.mod

@@ -2,4 +2,4 @@ module github.com/cli/browser
 
 go 1.13
 
-require github.com/cli/safeexec v1.0.0
+require golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d

go.sum

@@ -1,2 +1,2 @@
-github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
-github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
+golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d h1:jbzgAvDZn8aEnytae+4ou0J0GwFZoHR0hOrTg4qH8GA=
+golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=