peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge a24f52b065 into 7be5935c55

Browse Source
This commit is contained in:
Saeed Rasooli 2018-07-17 00:42:32 +00:00 committed by GitHub
commit 91cb3ca22d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/serv.go
View File

@ -151,13 +151,18 @@ func runServ(c *cli.Context) error {
reponame = reponame[:len(reponame)-5] reponame = reponame[:len(reponame)-5]
} }
os.Setenv(models.EnvRepoUsername, username) env := []string{}
if isWiki { addEnv := func(key string, value string) {
os.Setenv(models.EnvRepoIsWiki, "true") env = append(env, key+"="+value)
} else {
os.Setenv(models.EnvRepoIsWiki, "false")
} }
os.Setenv(models.EnvRepoName, reponame)
addEnv(models.EnvRepoUsername, username)
if isWiki {
addEnv(models.EnvRepoIsWiki, "true")
} else {
addEnv(models.EnvRepoIsWiki, "false")
}
addEnv(models.EnvRepoName, reponame)
repo, err := models.GetRepositoryByOwnerAndName(username, reponame) repo, err := models.GetRepositoryByOwnerAndName(username, reponame)
if err != nil { if err != nil {
@ -255,8 +260,8 @@ func runServ(c *cli.Context) error {
user.Name, repoPath) user.Name, repoPath)
} }
os.Setenv(models.EnvPusherName, user.Name) addEnv(models.EnvPusherName, user.Name)
os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", user.ID)) addEnv(models.EnvPusherID, fmt.Sprintf("%d", user.ID))
} }
} }
@ -316,8 +321,9 @@ func runServ(c *cli.Context) error {
} }
} }
os.Setenv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID)) addEnv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
gitcmd.Env = env
gitcmd.Dir = setting.RepoRootPath gitcmd.Dir = setting.RepoRootPath
gitcmd.Stdout = os.Stdout gitcmd.Stdout = os.Stdout
gitcmd.Stdin = os.Stdin gitcmd.Stdin = os.Stdin