diff options
| author | wxiaoguang | 2021-12-01 15:50:01 +0800 |
|---|---|---|
| committer | GitHub | 2021-12-01 15:50:01 +0800 |
| commit | 042cac5fedeec8af53080b9666fe043072f3a6be (patch) | |
| tree | b13d57faa71ba8bc9f8b3d40f5be7e3735ac66a4 /contrib | |
| parent | a3517d8668482b58cb80ba10a956fe4e27e1a429 (diff) | |
Improve install code to avoid low-level mistakes. (#17779)
* Improve install code to avoid low-level mistakes.
If a user tries to do a re-install in a Gitea database, they gets a warning and double check.
When Gitea runs, it never create empty app.ini automatically.
Also some small (related) refactoring:
* Refactor db.InitEngine related logic make it more clean (especially for the install code)
* Move some i18n strings out from setting.go to make the setting.go can be easily maintained.
* Show errors in CLI code if an incorrect app.ini is used.
* APP_DATA_PATH is created when installing, and checked when starting (no empty directory is created any more).
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/environment-to-ini/environment-to-ini.go | 1 | ||||
| -rw-r--r-- | contrib/pr/checkout.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/environment-to-ini/environment-to-ini.go b/contrib/environment-to-ini/environment-to-ini.go index 03c876aa6..ccda03fa9 100644 --- a/contrib/environment-to-ini/environment-to-ini.go +++ b/contrib/environment-to-ini/environment-to-ini.go @@ -156,6 +156,7 @@ func runEnvironmentToIni(c *cli.Context) error { destination = setting.CustomConf } if destination != setting.CustomConf || changed { + log.Info("Settings saved to: %q", destination) err = cfg.SaveTo(destination) if err != nil { return err diff --git a/contrib/pr/checkout.go b/contrib/pr/checkout.go index 1e2a9714e..18c0585f4 100644 --- a/contrib/pr/checkout.go +++ b/contrib/pr/checkout.go @@ -49,7 +49,7 @@ func runPR() { log.Fatal(err) } setting.SetCustomPathAndConf("", "", "") - setting.NewContext() + setting.LoadAllowEmpty() setting.RepoRootPath, err = os.MkdirTemp(os.TempDir(), "repos") if err != nil { |