diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/setting/setting.go | 6 | ||||
| -rw-r--r-- | modules/user/user.go | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index acd3aae6..79e47c89 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -24,6 +24,7 @@ import ( "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" // "github.com/gogits/gogs/modules/ssh" + "github.com/gogits/gogs/modules/user" ) type Scheme string @@ -309,10 +310,7 @@ func NewConfigContext() { }[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")] RunUser = Cfg.Section("").Key("RUN_USER").String() - curUser := os.Getenv("USER") - if len(curUser) == 0 { - curUser = os.Getenv("USERNAME") - } + curUser := user.CurrentUsername() // Does not check run user when the install lock is off. if InstallLock && RunUser != curUser { log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser) diff --git a/modules/user/user.go b/modules/user/user.go new file mode 100644 index 00000000..8a2557f3 --- /dev/null +++ b/modules/user/user.go @@ -0,0 +1,18 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package user + +import ( + "os" +) + +func CurrentUsername() string { + curUserName := os.Getenv("USER") + if len(curUserName) > 0 { + return curUserName + } + + return os.Getenv("USERNAME") +} |