diff options
| author | Dave Cheney | 2014-07-10 17:55:24 +1000 | 
|---|---|---|
| committer | Dave Cheney | 2014-07-10 17:55:24 +1000 | 
| commit | a8e22702fdf008223f15dee352fc6ba0cbc26ee7 (patch) | |
| tree | f328d00f4e928750481dcca8446f6e0f98745c3d | |
| parent | da95f49dbaf647970bb88b378237f938b51aaea6 (diff) | |
| download | browser-a8e22702fdf008223f15dee352fc6ba0cbc26ee7.tar.bz2 | |
move runCmd into shared code
| -rw-r--r-- | browser.go | 9 | ||||
| -rw-r--r-- | browser_linux.go | 12 | 
2 files changed, 9 insertions, 12 deletions
| @@ -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() -} | 
