diff options
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index acd3aae689..79e47c8901 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) |