go get

diff --git a/modules/base/template.go b/modules/base/template.go
index 863bd89e81028803ab9ed3a0be21cd8b1801d5dd..6241497969737b45ba007d0a30f03535e0022ff6 100644 (file)
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -197,15 +197,3 @@ func DiffLineTypeToStr(diffType int) string {
        }
        return "same"
 }
-
-const (
-       TPL_GO_GET_META = `<meta name="go-import" content="%s git %s">`
-)
-
-func GetGoGetMetaList() []byte {
-       buf := bytes.NewBuffer([]byte(""))
-       for meta := range GoGetMetas {
-               buf.WriteString(fmt.Sprintf(TPL_GO_GET_META, Domain, meta))
-       }
-       return buf.Bytes()
-}

diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index cd13d4ef492dc4bcd0efd809c6a9bef9eea3bd61..1e79ce9870e1ae1f66bf36dfe53eca8a429bba0c 100644 (file)
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -135,7 +135,8 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
                ctx.Data["CloneLink"] = ctx.Repo.CloneLink
 
                if ctx.Repo.Repository.IsGoget {
-                       ctx.Data["GoGetLink"] = strings.TrimSuffix(ctx.Repo.CloneLink.HTTPS, ".git")
+                       ctx.Data["GoGetLink"] = fmt.Sprintf("%s%s/%s", base.AppUrl, user.LowerName, repo.LowerName)
+                       ctx.Data["GoGetImport"] = fmt.Sprintf("%s/%s/%s", base.Domain, user.LowerName, repo.LowerName)
                }
 
                // when repo is bare, not valid branch

diff --git a/routers/dashboard.go b/routers/dashboard.go
index 12635412ad39a7e8aa02bcd7d2b82de0c4bcda08..2c81cf23c1798d8feed1c5fcaad02d75c420fcc2 100644 (file)
--- a/routers/dashboard.go
+++ b/routers/dashboard.go
@@ -11,11 +11,6 @@ import (
 )
 
 func Home(ctx *middleware.Context) {
-       if ctx.Query("go-get") == "1" {
-               ctx.Write(base.GetGoGetMetaList())
-               return
-       }
-
        if ctx.IsSigned {
                user.Dashboard(ctx)
                return

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index a7088d5552ea76e1381920d1bdfef15a2de45d11..dda26899d0b2011e33006cbd552aec99a4193037 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -107,10 +107,6 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
 }
 
 func Single(ctx *middleware.Context, params martini.Params) {
-       if ctx.Query("go-get") == "1" {
-               base.GoGetMetas[strings.TrimSuffix(ctx.Repo.CloneLink.HTTPS, ".git")] = true
-       }
-
        branchName := ctx.Repo.BranchName
        userName := ctx.Repo.Owner.Name
        repoName := ctx.Repo.Repository.Name

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 1d63b46634462592c7d68471661d65c942fcb769..0c18c8083ccf8ecde911eabe5107998a8faabfb4 100644 (file)
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -9,7 +9,7 @@
                <meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" />
                <meta name="keywords" content="go, git">
                <meta name="_csrf" content="{{.CsrfToken}}" />
-               <meta name="go-import" content="{{AppDomain}} git {{if .Repository.IsGoget}}{{.GoGetLink}}{{end}}">
+               {{if .Repository.IsGoget}}<meta name="go-import" content="{{.GoGetImport}} git {{.GoGetLink}}">{{end}}
 
                 <!-- Stylesheets -->
                {{if IsProdMode}}