From 7551139caf20e7dbfb8f0b55061ad1bf7d65e766 Mon Sep 17 00:00:00 2001
From: Sam Coe <samcoe@users.noreply.github.com>
Date: Wed, 16 Sep 2020 16:04:58 +0200
Subject: [PATCH] Address PR comments

---
 pkg/browser/browser.go      | 12 ++++--------
 pkg/browser/browser_test.go |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkg/browser/browser.go b/pkg/browser/browser.go
index 6496966a4..d972542f6 100644
--- a/pkg/browser/browser.go
+++ b/pkg/browser/browser.go
@@ -30,10 +30,10 @@ func ForOS(goos, url string) *exec.Cmd {
 		r := strings.NewReplacer("&", "^&")
 		args = append(args, "/c", "start", r.Replace(url))
 	default:
-		if findExe("xdg-open") {
-			exe = "xdg-open"
-		} else {
+		if findExe("wslview") {
 			exe = "wslview"
+		} else {
+			exe = "xdg-open"
 		}
 		args = append(args, url)
 	}
@@ -58,9 +58,5 @@ func FromLauncher(launcher, url string) (*exec.Cmd, error) {
 
 var findExe = func(command string) bool {
 	_, err := exec.LookPath(command)
-	if err != nil {
-		return false
-	} else {
-		return true
-	}
+	return err == nil
 }
diff --git a/pkg/browser/browser_test.go b/pkg/browser/browser_test.go
index dd007f950..97e6b1a13 100644
--- a/pkg/browser/browser_test.go
+++ b/pkg/browser/browser_test.go
@@ -30,7 +30,7 @@ func TestForOS(t *testing.T) {
 				goos: "linux",
 				url:  "https://example.com/path?a=1&b=2",
 			},
-			findExe: true,
+			findExe: false, // wslview does not exist on standard Linux
 			want:    []string{"xdg-open", "https://example.com/path?a=1&b=2"},
 		},
 		{
@@ -39,7 +39,7 @@ func TestForOS(t *testing.T) {
 				goos: "linux",
 				url:  "https://example.com/path?a=1&b=2",
 			},
-			findExe: false,
+			findExe: true, // wslview exists on WSL
 			want:    []string{"wslview", "https://example.com/path?a=1&b=2"},
 		},
 		{