瀏覽代碼

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 年之前
父節點
當前提交
679323de10
No account linked to committer's email address
共有 1 個檔案被更改,包括 5 行新增2 行删除
  1. 5
    2
      internal/driver/commands.go

+ 5
- 2
internal/driver/commands.go 查看文件

@@ -336,11 +336,15 @@ func listHelp(c string, redirect bool) string {
336 336
 }
337 337
 
338 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 342
 func browsers() []string {
340 343
 	var cmds []string
341 344
 	if userBrowser := os.Getenv("BROWSER"); userBrowser != "" {
342 345
 		cmds = append(cmds, userBrowser)
343 346
 	}
347
+	cmds = append(cmds, []string{"chrome", "google-chrome", "chromium", "firefox"}...)
344 348
 	switch runtime.GOOS {
345 349
 	case "darwin":
346 350
 		cmds = append(cmds, "/usr/bin/open")
@@ -348,12 +352,11 @@ func browsers() []string {
348 352
 		cmds = append(cmds, "cmd /c start")
349 353
 	default:
350 354
 		if os.Getenv("DISPLAY") != "" {
351
-			// xdg-open is only for use in a desktop environment.
352 355
 			cmds = append(cmds, "xdg-open")
353 356
 		}
354 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 362
 var kcachegrind = []string{"kcachegrind"}