]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/internal/browser: use xdg-open only from a desktop session
authorChris Broadfoot <cbro@golang.org>
Wed, 22 Feb 2017 23:48:38 +0000 (15:48 -0800)
committerChris Broadfoot <cbro@golang.org>
Thu, 23 Feb 2017 19:17:15 +0000 (19:17 +0000)
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>
src/cmd/internal/browser/browser.go

index 897086f47177ddf06193a194610206fc659cfda5..33b7bb90405a6ab115774b9a87a0cea4f2449d21 100644 (file)
@@ -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"},