mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-21 23:02:41 +01:00
fix #660
This commit is contained in:
parent
5b32cdd960
commit
5b96e3fcc7
4 changed files with 13 additions and 3 deletions
|
@ -161,6 +161,7 @@ func runWeb(*cli.Context) {
|
|||
// Routers.
|
||||
m.Get("/", ignSignIn, routers.Home)
|
||||
m.Get("/explore", ignSignIn, routers.Explore)
|
||||
// FIXME: when i'm binding form here???
|
||||
m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.Install)
|
||||
m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallPost)
|
||||
m.Group("", func() {
|
||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
|||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.5.8.1122 Beta"
|
||||
const APP_VER = "0.5.8.1124 Beta"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
|
|
@ -88,6 +88,7 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
|
|||
ctx.Data["Title"] = ctx.Tr("install.install")
|
||||
ctx.Data["PageIsInstall"] = true
|
||||
|
||||
// FIXME: when i'm ckeching length here? should they all be 0 no matter when?
|
||||
// Get and assign values to install form.
|
||||
if len(form.DbHost) == 0 {
|
||||
form.DbHost = models.DbCfg.Host
|
||||
|
@ -109,7 +110,15 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
|
|||
form.RepoRootPath = setting.RepoRootPath
|
||||
}
|
||||
if len(form.RunUser) == 0 {
|
||||
form.RunUser = setting.RunUser
|
||||
// Note: it's not normall to use SSH in windows so current user can be first option(not git).
|
||||
if setting.IsWindows && setting.RunUser == "git" {
|
||||
form.RunUser = os.Getenv("USER")
|
||||
if len(form.RunUser) == 0 {
|
||||
form.RunUser = os.Getenv("USERNAME")
|
||||
}
|
||||
} else {
|
||||
form.RunUser = setting.RunUser
|
||||
}
|
||||
}
|
||||
if len(form.Domain) == 0 {
|
||||
form.Domain = setting.Domain
|
||||
|
|
|
@ -1 +1 @@
|
|||
0.5.8.1122 Beta
|
||||
0.5.8.1124 Beta
|
Loading…
Reference in a new issue