summaryrefslogtreecommitdiff
path: root/src/cmd/internal/browser
diff options
context:
space:
mode:
authorChris Broadfoot <cbro@golang.org>2017-02-22 15:48:38 -0800
committerChris Broadfoot <cbro@golang.org>2017-02-23 19:17:15 +0000
commitd580972d5933c77d9319ec99ff1b2f111f05c727 (patch)
tree1d3af858f98e351f35272009f6b57018d50bd5b2 /src/cmd/internal/browser
parent731fd009f0acef70d939f3cb62f81a83e3e9e2bb (diff)
downloadgo-git-d580972d5933c77d9319ec99ff1b2f111f05c727.tar.gz
cmd/internal/browser: use xdg-open only from a desktop session
xdg-open's man page says: > xdg-open is for use inside a desktop session only. Use the DISPLAY environment variable to detect this. Updates #19131. Change-Id: I3926b3e1042393939b2ec6aacd9b63ac8192df3b Reviewed-on: https://go-review.googlesource.com/37390 Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
Diffstat (limited to 'src/cmd/internal/browser')
-rw-r--r--src/cmd/internal/browser/browser.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cmd/internal/browser/browser.go b/src/cmd/internal/browser/browser.go
index 897086f471..33b7bb9040 100644
--- a/src/cmd/internal/browser/browser.go
+++ b/src/cmd/internal/browser/browser.go
@@ -23,7 +23,10 @@ func Commands() [][]string {
case "windows":
cmds = append(cmds, []string{"cmd", "/c", "start"})
default:
- cmds = append(cmds, []string{"xdg-open"})
+ if os.Getenv("DISPLAY") != "" {
+ // xdg-open is only for use in a desktop environment.
+ cmds = append(cmds, []string{"xdg-open"})
+ }
}
cmds = append(cmds,
[]string{"chrome"},