diff --git a/cmd/web.go b/cmd/web.go index c2017a2850..3d9d4a7c84 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -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() { diff --git a/gogs.go b/gogs.go index 60e53fb4ed..2cecb58be5 100644 --- a/gogs.go +++ b/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()) diff --git a/routers/install.go b/routers/install.go index 408ca108f6..df8a05651a 100644 --- a/routers/install.go +++ b/routers/install.go @@ -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 diff --git a/templates/.VERSION b/templates/.VERSION index d2d39a1268..d4908c46cc 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.5.8.1122 Beta \ No newline at end of file +0.5.8.1124 Beta \ No newline at end of file