Commit | Line | Data |
---|---|---|
9732ef97 FF |
1 | diff -u -r ../hub-2.2.8/utils/utils.go ./utils/utils.go |
2 | --- ../hub-2.2.8/utils/utils.go 2016-09-11 14:47:09.000000000 -0400 | |
3 | +++ ./utils/utils.go 2016-09-29 19:20:23.557570185 -0400 | |
4 | @@ -3,8 +3,6 @@ | |
5 | import ( | |
6 | "errors" | |
7 | "os" | |
8 | - "os/exec" | |
9 | - "runtime" | |
10 | "strings" | |
11 | ||
12 | "github.com/github/hub/ui" | |
13 | @@ -24,7 +22,7 @@ | |
14 | func BrowserLauncher() ([]string, error) { | |
15 | browser := os.Getenv("BROWSER") | |
16 | if browser == "" { | |
17 | - browser = searchBrowserLauncher(runtime.GOOS) | |
18 | + browser = "termux-open-url" | |
19 | } | |
20 | ||
21 | if browser == "" { | |
22 | @@ -34,27 +32,6 @@ | |
23 | return strings.Split(browser, " "), nil | |
24 | } | |
25 | ||
26 | -func searchBrowserLauncher(goos string) (browser string) { | |
27 | - switch goos { | |
28 | - case "darwin": | |
29 | - browser = "open" | |
30 | - case "windows": | |
31 | - browser = "cmd /c start" | |
32 | - default: | |
33 | - candidates := []string{"xdg-open", "cygstart", "x-www-browser", "firefox", | |
34 | - "opera", "mozilla", "netscape"} | |
35 | - for _, b := range candidates { | |
36 | - path, err := exec.LookPath(b) | |
37 | - if err == nil { | |
38 | - browser = path | |
39 | - break | |
40 | - } | |
41 | - } | |
42 | - } | |
43 | - | |
44 | - return browser | |
45 | -} | |
46 | - | |
47 | func IsOption(confirm, short, long string) bool { | |
48 | return strings.EqualFold(confirm, short) || strings.EqualFold(confirm, long) | |
49 | } |