Merge pull request #51 from shopetan/fix_google_base_url

Fix google base url
KeisukeYamashita · Oct 8, 2019 · 63300de · 63300de
2 parents 755d758 + 1b0b2a7
commit 63300de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cli/google.go b/cli/google.go
@@ -10,19 +10,19 @@ func newGoogleCmd() cli.Command {
 	return cli.Command{
 		Name:    "google",
 		Aliases: []string{"g"},
-		Usage:   "Open GCP resource",
+		Usage:   "Open Google source",
 		Flags: []cli.Flag{
 			cli.StringFlag{
 				Name:  "project",
 				Usage: "Specify the project to open",
 			},
 		},
 		Action: func(c *cli.Context) error {
-			gcp, err := google.GetProvider()
+			g, err := google.GetProvider()
 			if err != nil {
 				return err
 			}
-			return browser.Open(c, gcp)
+			return browser.Open(c, g)
 		},
 		Subcommands: []cli.Command{
 			newGoogleSearchCmd(),
@@ -42,11 +42,11 @@ func newGoogleSearchCmd() cli.Command {
 			},
 		},
 		Action: func(c *cli.Context) error {
-			gcp, err := google.GetProvider()
+			g, err := google.GetProvider()
 			if err != nil {
 				return err
 			}
-			return browser.Open(c, gcp)
+			return browser.Open(c, g)
 		},
 	}
 

diff --git a/providers/google/google.go b/providers/google/google.go
@@ -41,12 +41,12 @@ func (p *Provider) GetTargetURL() (string, error) {
 	if p.baseURL, err = url.Parse(baseURL); err != nil {
 		return "", err
 	}
-
 	p.addProductPath(p.Ctx.Command.Name)
 	return p.URL.String(), nil
 }
 
 func (p *Provider) addProductPath(product string) {
+	p.URL = p.baseURL
 	switch product {
 	case "search":
 		p.join("search")