From a8e22702fdf008223f15dee352fc6ba0cbc26ee7 Mon Sep 17 00:00:00 2001 From: Dave Cheney Date: Thu, 10 Jul 2014 17:55:24 +1000 Subject: move runCmd into shared code --- browser.go | 9 +++++++++ browser_linux.go | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/browser.go b/browser.go index bc312f5..9eb610f 100644 --- a/browser.go +++ b/browser.go @@ -7,6 +7,8 @@ import ( "fmt" "io" "io/ioutil" + "os" + "os/exec" "path/filepath" ) @@ -40,3 +42,10 @@ func OpenReader(r io.Reader) error { func OpenURL(url string) error { return openBrowser(url) } + +func runCmd(prog string, args ...string) error { + cmd := exec.Command(prog, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + return cmd.Run() +} diff --git a/browser_linux.go b/browser_linux.go index 4d958e7..b1b40e8 100644 --- a/browser_linux.go +++ b/browser_linux.go @@ -1,10 +1,5 @@ package browser -import ( - "os" - "os/exec" -) - func openBrowser(url string) error { // try sensible-browser first if err := runCmd("sensible-browser", url); err == nil { @@ -13,10 +8,3 @@ func openBrowser(url string) error { // sensible-browser not availble, try xdg-open return runCmd("xdg-open", url) } - -func runCmd(prog string, args ...string) error { - cmd := exec.Command(prog, args...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - return cmd.Run() -} -- cgit v1.2.3