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

cmd/serv.go: use a string slice instead of map for keeping env vars

Browse Source
This commit is contained in:
Saeed Rasooli 2018-04-23 16:56:49 +08:00
parent ca10494f4a
commit a24f52b065
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/serv.go
View File

@ -151,15 +151,18 @@ func runServ(c *cli.Context) error {
reponame = reponame[:len(reponame)-5]
}
env := map[string]string{}
env[models.EnvRepoUsername] = username
if isWiki {
env[models.EnvRepoIsWiki] = "true"
} else {
env[models.EnvRepoIsWiki] = "false"
env := []string{}
addEnv := func(key string, value string) {
env = append(env, key+"="+value)
}
env[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)
if err != nil {
@ -251,8 +254,8 @@ func runServ(c *cli.Context) error {
user.Name, repoPath)
}
env[models.EnvPusherName] = user.Name
env[models.EnvPusherID] = fmt.Sprintf("%d", user.ID)
addEnv(models.EnvPusherName, user.Name)
addEnv(models.EnvPusherID, fmt.Sprintf("%d", user.ID))
}
}
@ -312,12 +315,9 @@ func runServ(c *cli.Context) error {
}
}
env[models.ProtectedBranchRepoID] = fmt.Sprintf("%d", repo.ID)
for key, value := range env {
gitcmd.Env = append(gitcmd.Env, fmt.Sprintf("%s=%s", key, value))
}
addEnv(models.ProtectedBranchRepoID, fmt.Sprintf("%d", repo.ID))
gitcmd.Env = env
gitcmd.Dir = setting.RepoRootPath
gitcmd.Stdout = os.Stdout
gitcmd.Stdin = os.Stdin