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

avoid os.Setenv calls in runServ, add env vars to gitcmd.Env instead

Browse Source
This commit is contained in:
Saeed Rasooli 2018-04-09 12:18:23 +08:00
parent 1610296f54
commit ca10494f4a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/serv.go
View File

@ -151,13 +151,15 @@ func runServ(c *cli.Context) error {
reponame = reponame[:len(reponame)-5]
}
os.Setenv(models.EnvRepoUsername, username)
env := map[string]string{}
env[models.EnvRepoUsername] = username
if isWiki {
os.Setenv(models.EnvRepoIsWiki, "true")
env[models.EnvRepoIsWiki] = "true"
} else {
os.Setenv(models.EnvRepoIsWiki, "false")
env[models.EnvRepoIsWiki] = "false"
}
os.Setenv(models.EnvRepoName, reponame)
env[models.EnvRepoName] = reponame
repo, err := models.GetRepositoryByOwnerAndName(username, reponame)
if err != nil {
@ -249,8 +251,8 @@ func runServ(c *cli.Context) error {
user.Name, repoPath)
}
os.Setenv(models.EnvPusherName, user.Name)
os.Setenv(models.EnvPusherID, fmt.Sprintf("%d", user.ID))
env[models.EnvPusherName] = user.Name
env[models.EnvPusherID] = fmt.Sprintf("%d", user.ID)
}
}
@ -310,7 +312,11 @@ func runServ(c *cli.Context) error {
}
}
os.Setenv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
env[models.ProtectedBranchRepoID] = fmt.Sprintf("%d", repo.ID)
for key, value := range env {
gitcmd.Env = append(gitcmd.Env, fmt.Sprintf("%s=%s", key, value))
}
gitcmd.Dir = setting.RepoRootPath
gitcmd.Stdout = os.Stdout