aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Cheney2014-07-10 17:53:48 +1000
committerDave Cheney2014-07-10 17:53:48 +1000
commitda95f49dbaf647970bb88b378237f938b51aaea6 (patch)
treea204761de4bc2385432c9dda8e8c16e126e2c072
parent69832124a7731c2457fd9cd135cb8d718535aa6e (diff)
downloadbrowser-da95f49dbaf647970bb88b378237f938b51aaea6.tar.bz2
Fix open on linux
-rw-r--r--browser_linux.go18
1 files changed, 13 insertions, 5 deletions
diff --git a/browser_linux.go b/browser_linux.go
index ccd1685..4d958e7 100644
--- a/browser_linux.go
+++ b/browser_linux.go
@@ -1,14 +1,22 @@
package browser
import (
+ "os"
"os/exec"
)
func openBrowser(url string) error {
- sensibleBrowser, err := exec.LookPath("sensible-browser")
- if err != nil {
- // sensible-browser not availble, try xdg-open
- return exec.Command("xdg-open", url).Run()
+ // try sensible-browser first
+ if err := runCmd("sensible-browser", url); err == nil {
+ return nil
}
- return exec.Command(sensibleBrowser, url).Run()
+ // 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()
}