aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-07-14 15:38:46 -0400
committerRuss Cox <rsc@golang.org>2015-07-15 04:30:35 +0000
commit2bd1e5e50b677790a2f48127bf443b32ca8193db (patch)
tree2e75706148d0084dd12f6c50a424b70738d09e56
parent9adf684686bad7c6319080d0b1da8308a77b08c9 (diff)
downloadgo-2bd1e5e50b677790a2f48127bf443b32ca8193db.tar.gz
go-2bd1e5e50b677790a2f48127bf443b32ca8193db.zip
cmd/pprof: run $BROWSER and system browser before Chrome
Fixes #10259. Change-Id: Ica6b8301cc8291785a3c496fb513050813b2d8df Reviewed-on: https://go-review.googlesource.com/12201 Reviewed-by: Andrew Gerrand <adg@golang.org>
-rw-r--r--src/cmd/pprof/internal/commands/commands.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cmd/pprof/internal/commands/commands.go b/src/cmd/pprof/internal/commands/commands.go
index 167e57f1f4..175c7cc99c 100644
--- a/src/cmd/pprof/internal/commands/commands.go
+++ b/src/cmd/pprof/internal/commands/commands.go
@@ -82,7 +82,10 @@ func PProf(c Completer, interactive **bool) Commands {
// browsers returns a list of commands to attempt for web visualization
// on the current platform
func browsers() []string {
- cmds := []string{"chrome", "google-chrome", "firefox"}
+ var cmds []string
+ if exe := os.Getenv("BROWSER"); exe != "" {
+ cmds = append(cmds, exe)
+ }
switch runtime.GOOS {
case "darwin":
cmds = append(cmds, "/usr/bin/open")
@@ -91,6 +94,7 @@ func browsers() []string {
default:
cmds = append(cmds, "xdg-open")
}
+ cmds = append(cmds, "chrome", "google-chrome", "firefox")
return cmds
}