qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-05 17:26:11 -07:00
Code Releases Activity

cmd/internal/browser: use xdg-open only from a desktop session

Browse Source 
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>
This commit is contained in:
Chris Broadfoot 2017-02-22 15:48:38 -08:00
parent 731fd009f0
commit d580972d59
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/internal/browser/browser.go
View File

@ -23,8 +23,11 @@ func Commands() [][]string {
case "windows": case "windows":
cmds = append(cmds, []string{"cmd", "/c", "start"}) cmds = append(cmds, []string{"cmd", "/c", "start"})
default: default:
if os.Getenv("DISPLAY") != "" {
// xdg-open is only for use in a desktop environment.
cmds = append(cmds, []string{"xdg-open"}) cmds = append(cmds, []string{"xdg-open"})
} }
}
cmds = append(cmds, cmds = append(cmds,
[]string{"chrome"}, []string{"chrome"},
[]string{"google-chrome"}, []string{"google-chrome"},