diff options
| author | 无闻 <u@gogs.io> | 2015-08-19 18:29:04 +0800 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-08-19 18:29:04 +0800 |
| commit | a5e1ada4745aca488d5de3479606f2e9ecd19e42 (patch) | |
| tree | 0b7e536d22272e1add8ffde762287f980970601e /routers | |
| parent | de6850b429665454b938c14321ebb065ac5f3354 (diff) | |
| parent | 0d38794c7f9b25b2e602cb0d2f686e74cd1ab1cb (diff) | |
| download | gitea-a5e1ada4745aca488d5de3479606f2e9ecd19e42.tar.gz gitea-a5e1ada4745aca488d5de3479606f2e9ecd19e42.zip | |
Merge pull request #1414 from nice-software/wip/currentUser
Factor out function to get the current user
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/install.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/routers/install.go b/routers/install.go index 074a480371..4e7dd3904e 100644 --- a/routers/install.go +++ b/routers/install.go @@ -26,6 +26,7 @@ import ( "github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/social" + "github.com/gogits/gogs/modules/user" ) const ( @@ -111,10 +112,7 @@ func Install(ctx *middleware.Context) { // Note(unknwon): it's hard for Windows users change a running user, // so just use current one if config says default. if setting.IsWindows && setting.RunUser == "git" { - form.RunUser = os.Getenv("USER") - if len(form.RunUser) == 0 { - form.RunUser = os.Getenv("USERNAME") - } + form.RunUser = user.CurrentUsername() } else { form.RunUser = setting.RunUser } @@ -201,10 +199,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { } // Check run user. - curUser := os.Getenv("USER") - if len(curUser) == 0 { - curUser = os.Getenv("USERNAME") - } + curUser := user.CurrentUsername() if form.RunUser != curUser { ctx.Data["Err_RunUser"] = true ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, curUser), INSTALL, &form) |