Skip to content

Commit 99a9298

Browse files
authored
Fix running project on Windows (#29)
* Allow running project on Windows * Un-export Window-specific identifiers * Remove obsolete `setFlags`
1 parent ce105d0 commit 99a9298

9 files changed

+9
-20
lines changed

browser.go

-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ func runCmd(prog string, args ...string) error {
5858
cmd := exec.Command(prog, args...)
5959
cmd.Stdout = Stdout
6060
cmd.Stderr = Stderr
61-
setFlags(cmd)
6261
return cmd.Run()
6362
}

browser_darwin.go

-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ import "os/exec"
55
func openBrowser(url string) error {
66
return runCmd("open", url)
77
}
8-
9-
func setFlags(cmd *exec.Cmd) {}

browser_freebsd.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ func openBrowser(url string) error {
1212
}
1313
return err
1414
}
15-
16-
func setFlags(cmd *exec.Cmd) {}

browser_linux.go

-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ func openBrowser(url string) error {
1919

2020
return &exec.Error{Name: strings.Join(providers, ","), Err: exec.ErrNotFound}
2121
}
22-
23-
func setFlags(cmd *exec.Cmd) {}

browser_openbsd.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ func openBrowser(url string) error {
1212
}
1313
return err
1414
}
15-
16-
func setFlags(cmd *exec.Cmd) {}

browser_unsupported.go

-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ import (
1111
func openBrowser(url string) error {
1212
return fmt.Errorf("openBrowser: unsupported operating system: %v", runtime.GOOS)
1313
}
14-
15-
func setFlags(cmd *exec.Cmd) {}

browser_windows.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
//go:generate mkwinsyscall -output zbrowser_windows.go browser_windows.go
2-
//sys ShellExecute(hwnd int, verb string, file string, args string, cwd string, showCmd int) (err error) = shell32.ShellExecuteW
2+
//sys shellExecute(hwnd int, verb string, file string, args string, cwd string, showCmd int) (err error) = shell32.ShellExecuteW
33
package browser
44

55
import "os/exec"
6-
const SW_SHOWNORMAL = 1
76

8-
func openBrowser(url string) error {
9-
return ShellExecute(0, "", url, "", "", SW_SHOWNORMAL)
10-
}
7+
const sW_SHOWNORMAL = 1
118

12-
func setFlags(cmd *exec.Cmd) {
9+
func openBrowser(url string) error {
10+
return shellExecute(0, "", url, "", "", sW_SHOWNORMAL)
1311
}

go.mod

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module github.com/pkg/browser
22

33
go 1.14
4+
5+
require golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d // indirect

zbrowser_windows.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)