Procházet zdrojové kódy

update order of available browsers (#392)

Margaret Nolan před 6 roky
rodič
revize
2b5d4350d6
No account linked to committer's email address
1 změnil soubory, kde provedl 11 přidání a 9 odebrání
  1. 11
    9
      internal/driver/commands.go

+ 11
- 9
internal/driver/commands.go Zobrazit soubor

@@ -337,21 +337,23 @@ func listHelp(c string, redirect bool) string {
337 337
 
338 338
 // browsers returns a list of commands to attempt for web visualization.
339 339
 func browsers() []string {
340
-	cmds := []string{"chrome", "google-chrome", "firefox"}
340
+	var cmds []string
341
+	if userBrowser := os.Getenv("BROWSER"); userBrowser != "" {
342
+		cmds = append(cmds, userBrowser)
343
+	}
341 344
 	switch runtime.GOOS {
342 345
 	case "darwin":
343
-		return append(cmds, "/usr/bin/open")
346
+		cmds = append(cmds, "/usr/bin/open")
344 347
 	case "windows":
345
-		return append(cmds, "cmd /c start")
348
+		cmds = append(cmds, "cmd /c start")
346 349
 	default:
347
-		userBrowser := os.Getenv("BROWSER")
348
-		if userBrowser != "" {
349
-			cmds = append([]string{userBrowser, "sensible-browser"}, cmds...)
350
-		} else {
351
-			cmds = append([]string{"sensible-browser"}, cmds...)
350
+		if os.Getenv("DISPLAY") != "" {
351
+			// xdg-open is only for use in a desktop environment.
352
+			cmds = append(cmds, "xdg-open")
352 353
 		}
353
-		return append(cmds, "xdg-open")
354
+		cmds = append(cmds, "sensible-browser")
354 355
 	}
356
+	return append(cmds, []string{"chrome", "google-chrome", "chromium", "firefox"}...)
355 357
 }
356 358
 
357 359
 var kcachegrind = []string{"kcachegrind"}