Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fallback browser when xdg-open does not exist #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 16, 2020
Merged

Fallback browser when xdg-open does not exist #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d111b2
Use WSL2 detection to pick browser
samcoe Sep 16, 2020
dd1c24a
Use `LookPath` to determine if `xdg-open` exists
samcoe Sep 16, 2020
7551139
Address PR comments
samcoe Sep 16, 2020
fd1d09d
Clean up linux logic to have better default logic
samcoe Sep 16, 2020
9058fee
Fix up structure for better testing
samcoe Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion pkg/browser/browser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func ForOS(goos, url string) *exec.Cmd {
r := strings.NewReplacer("&", "^&")
args = append(args, "/c", "start", r.Replace(url))
default:
exe = "xdg-open"
exe = linuxExe()
args = append(args, url)
}

Expand All @@ -51,3 +51,19 @@ func FromLauncher(launcher, url string) (*exec.Cmd, error) {
cmd.Stderr = os.Stderr
return cmd, nil
}

func linuxExe() string {
exe := "xdg-open"

_, err := lookPath(exe)
if err != nil {
_, err := lookPath("wslview")
if err == nil {
exe = "wslview"
}
}

return exe
}

var lookPath = exec.LookPath
20 changes: 20 additions & 0 deletions pkg/browser/browser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package browser

import (
"errors"
"reflect"
"testing"
)
Expand All @@ -13,6 +14,7 @@ func TestForOS(t *testing.T) {
tests := []struct {
name string
args args
exe string
want []string
}{
{
Expand All @@ -29,8 +31,18 @@ func TestForOS(t *testing.T) {
goos: "linux",
url: "https://example.com/path?a=1&b=2",
},
exe: "xdg-open",
want: []string{"xdg-open", "https://example.com/path?a=1&b=2"},
},
{
name: "WSL",
args: args{
goos: "linux",
url: "https://example.com/path?a=1&b=2",
},
exe: "wslview",
want: []string{"wslview", "https://example.com/path?a=1&b=2"},
},
{
name: "Windows",
args: args{
Expand All @@ -41,6 +53,14 @@ func TestForOS(t *testing.T) {
},
}
for _, tt := range tests {
lookPath = func(file string) (string, error) {
if file == tt.exe {
return file, nil
} else {
return "", errors.New("not found")
}
}

t.Run(tt.name, func(t *testing.T) {
if cmd := ForOS(tt.args.goos, tt.args.url); !reflect.DeepEqual(cmd.Args, tt.want) {
t.Errorf("ForOS() = %v, want %v", cmd.Args, tt.want)
Expand Down