aboutsummaryrefslogtreecommitdiffstats
path: root/modules/assetfs
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-07-10 06:43:37 +0800
committerGitHub <noreply@github.com>2023-07-09 22:43:37 +0000
commitfa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189 (patch)
tree885a32e803e934883ca047116441f56ac9435b5b /modules/assetfs
parent61e0d1a767e1a1a509de9de4aff42bdb79cc6443 (diff)
downloadgitea-fa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189.tar.gz
gitea-fa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189.zip
Make "install page" respect environment config (#25648)
Replace #25580 Fix #19453 The problem was: when users set "GITEA__XXX__YYY" , the "install page" doesn't respect it. So, to make the result consistent and avoid surprising end users, now the "install page" also writes the environment variables to the config file. And, to make things clear, there are enough messages on the UI to tell users what will happen. There are some necessary/related changes to `environment-to-ini.go`: * The "--clear" flag is removed and it was incorrectly written there. The "clear" operation should be done if INSTALL_LOCK=true * The "--prefix" flag is removed because it's never used, never documented and it only causes inconsistent behavior. ![image](https://github.com/go-gitea/gitea/assets/2114189/12778ee4-3fb5-4664-a73a-41ebbd77cd5b)
Diffstat (limited to 'modules/assetfs')
-rw-r--r--modules/assetfs/layered.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/assetfs/layered.go b/modules/assetfs/layered.go
index d032160a6f..e18a13e4aa 100644
--- a/modules/assetfs/layered.go
+++ b/modules/assetfs/layered.go
@@ -215,6 +215,7 @@ func (l *LayeredFS) WatchLocalChanges(ctx context.Context, callback func()) {
log.Error("Unable to list directories for asset local file-system %q: %v", layer.localPath, err)
continue
}
+ layerDirs = append(layerDirs, ".")
for _, dir := range layerDirs {
if err = watcher.Add(util.FilePathJoinAbs(layer.localPath, dir)); err != nil {
log.Error("Unable to watch directory %s: %v", dir, err)