From: Chris Broadfoot <cbro@golang.org>
Date: Wed, 22 Feb 2017 23:48:38 +0000 (-0800)
Subject: cmd/internal/browser: use xdg-open only from a desktop session
X-Git-Tag: go1.9beta1~1457
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d580972d5933c77d9319ec99ff1b2f111f05c727;p=gostls13.git

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>
---

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"},