Skip to content

Commit a8e2270

Browse files
committedJul 10, 2014
move runCmd into shared code
1 parent da95f49 commit a8e2270

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed
 

‎browser.go

+9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"fmt"
88
"io"
99
"io/ioutil"
10+
"os"
11+
"os/exec"
1012
"path/filepath"
1113
)
1214

@@ -40,3 +42,10 @@ func OpenReader(r io.Reader) error {
4042
func OpenURL(url string) error {
4143
return openBrowser(url)
4244
}
45+
46+
func runCmd(prog string, args ...string) error {
47+
cmd := exec.Command(prog, args...)
48+
cmd.Stdout = os.Stdout
49+
cmd.Stderr = os.Stderr
50+
return cmd.Run()
51+
}

‎browser_linux.go

-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package browser
22

3-
import (
4-
"os"
5-
"os/exec"
6-
)
7-
83
func openBrowser(url string) error {
94
// try sensible-browser first
105
if err := runCmd("sensible-browser", url); err == nil {
@@ -13,10 +8,3 @@ func openBrowser(url string) error {
138
// sensible-browser not availble, try xdg-open
149
return runCmd("xdg-open", url)
1510
}
16-
17-
func runCmd(prog string, args ...string) error {
18-
cmd := exec.Command(prog, args...)
19-
cmd.Stdout = os.Stdout
20-
cmd.Stderr = os.Stderr
21-
return cmd.Run()
22-
}

0 commit comments

Comments
 (0)