Merge remote-tracking branch 'upstream/master'

Author: mislav

browser.go

@@ -30,7 +30,7 @@ func OpenFile(path string) error {
 // OpenReader consumes the contents of r and presents the
 // results in a new browser window.
 func OpenReader(r io.Reader) error {
-	f, err := ioutil.TempFile("", "browser")
+	f, err := ioutil.TempFile("", "browser.*.html")
 	if err != nil {
 		return fmt.Errorf("browser: could not create temporary file: %w", err)
 	}
@@ -41,12 +41,7 @@ func OpenReader(r io.Reader) error {
 	if err := f.Close(); err != nil {
 		return fmt.Errorf("browser: caching temporary file failed: %w", err)
 	}
-	oldname := f.Name()
-	newname := oldname + ".html"
-	if err := os.Rename(oldname, newname); err != nil {
-		return fmt.Errorf("browser: renaming temporary file failed: %w", err)
-	}
-	return OpenFile(newname)
+	return OpenFile(f.Name())
 }
 
 // OpenURL opens a new browser window pointing to url.
@@ -58,6 +53,5 @@ func runCmd(prog string, args ...string) error {
 	cmd := exec.Command(prog, args...)
 	cmd.Stdout = Stdout
 	cmd.Stderr = Stderr
-	setFlags(cmd)
 	return cmd.Run()
 }

browser_darwin.go

@@ -1,9 +1,5 @@
 package browser
 
-import "os/exec"
-
 func openBrowser(url string) error {
 	return runCmd("open", url)
 }
-
-func setFlags(cmd *exec.Cmd) {}

browser_freebsd.go

@@ -13,5 +13,3 @@ func openBrowser(url string) error {
 	}
 	return err
 }
-
-func setFlags(cmd *exec.Cmd) {}

browser_linux.go

@@ -19,5 +19,3 @@ func openBrowser(url string) error {
 
 	return &exec.Error{Name: strings.Join(providers, ","), Err: exec.ErrNotFound}
 }
-
-func setFlags(cmd *exec.Cmd) {}

browser_netbsd.go

@@ -0,0 +1,14 @@
+package browser
+
+import (
+	"errors"
+	"os/exec"
+)
+
+func openBrowser(url string) error {
+	err := runCmd("xdg-open", url)
+	if e, ok := err.(*exec.Error); ok && e.Err == exec.ErrNotFound {
+		return errors.New("xdg-open: command not found - install xdg-utils from pkgsrc(7)")
+	}
+	return err
+}

browser_openbsd.go

@@ -13,5 +13,3 @@ func openBrowser(url string) error {
 	}
 	return err
 }
-
-func setFlags(cmd *exec.Cmd) {}

browser_unsupported.go

@@ -1,15 +1,12 @@
-// +build !linux,!windows,!darwin,!openbsd,!freebsd
+// +build !linux,!windows,!darwin,!openbsd,!freebsd,!netbsd
 
 package browser
 
 import (
 	"fmt"
-	"os/exec"
 	"runtime"
 )
 
 func openBrowser(url string) error {
 	return fmt.Errorf("openBrowser: unsupported operating system: %v", runtime.GOOS)
 }
-
-func setFlags(cmd *exec.Cmd) {}

browser_windows.go

@@ -1,14 +1,7 @@
-//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"
-
-const sW_SHOWNORMAL = 1
+import "golang.org/x/sys/windows"
 
 func openBrowser(url string) error {
-	return shellExecute(0, "", url, "", "", sW_SHOWNORMAL)
-}
-
-func setFlags(cmd *exec.Cmd) {
+	return windows.ShellExecute(0, nil, windows.StringToUTF16Ptr(url), nil, nil, windows.SW_SHOWNORMAL)
 }

go.mod

@@ -1,5 +1,5 @@
 module github.com/cli/browser
 
-go 1.13
+go 1.14
 
-require golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d
+require golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71

go.sum

@@ -1,2 +1,2 @@
-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=
+golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71 h1:X/2sJAybVknnUnV7AD2HdT6rm2p5BP6eH2j+igduWgk=
+golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=