Browse Source

Change order of commands returned by browser() (#418)

* change order of commands returned by browser()

* Add comment to explain browser command order
Margaret Nolan 6 years ago
parent
commit
679323de10
No account linked to committer's email address
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      internal/driver/commands.go

+ 5
- 2
internal/driver/commands.go View File

336
 }
336
 }
337
 
337
 
338
 // browsers returns a list of commands to attempt for web visualization.
338
 // browsers returns a list of commands to attempt for web visualization.
339
+// Commands which definitely will open a browser are prioritized over other
340
+// commands like xdg-open,  which may not open the javascript embedded SVG
341
+// files produced by the -web command in a browser.
339
 func browsers() []string {
342
 func browsers() []string {
340
 	var cmds []string
343
 	var cmds []string
341
 	if userBrowser := os.Getenv("BROWSER"); userBrowser != "" {
344
 	if userBrowser := os.Getenv("BROWSER"); userBrowser != "" {
342
 		cmds = append(cmds, userBrowser)
345
 		cmds = append(cmds, userBrowser)
343
 	}
346
 	}
347
+	cmds = append(cmds, []string{"chrome", "google-chrome", "chromium", "firefox"}...)
344
 	switch runtime.GOOS {
348
 	switch runtime.GOOS {
345
 	case "darwin":
349
 	case "darwin":
346
 		cmds = append(cmds, "/usr/bin/open")
350
 		cmds = append(cmds, "/usr/bin/open")
348
 		cmds = append(cmds, "cmd /c start")
352
 		cmds = append(cmds, "cmd /c start")
349
 	default:
353
 	default:
350
 		if os.Getenv("DISPLAY") != "" {
354
 		if os.Getenv("DISPLAY") != "" {
351
-			// xdg-open is only for use in a desktop environment.
352
 			cmds = append(cmds, "xdg-open")
355
 			cmds = append(cmds, "xdg-open")
353
 		}
356
 		}
354
 		cmds = append(cmds, "sensible-browser")
357
 		cmds = append(cmds, "sensible-browser")
355
 	}
358
 	}
356
-	return append(cmds, []string{"chrome", "google-chrome", "chromium", "firefox"}...)
359
+	return cmds
357
 }
360
 }
358
 
361
 
359
 var kcachegrind = []string{"kcachegrind"}
362
 var kcachegrind = []string{"kcachegrind"}