diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-15 16:44:44 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-15 19:14:22 +0200 |
| commit | 952a3194962dd91f87e5bd227a1591b00c39ff05 (patch) | |
| tree | b5c20ff0fea1b92190e21dbd6742ccf3a8d808d4 /hugolib/filesystems/basefs.go | |
| parent | 321418f22a4a94b87f01e1403a2f4a71106461fb (diff) | |
Fix live reload mount logic with sub paths
Fixes #6209
Diffstat (limited to 'hugolib/filesystems/basefs.go')
| -rw-r--r-- | hugolib/filesystems/basefs.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go index 2a1f994b2..de6baa130 100644 --- a/hugolib/filesystems/basefs.go +++ b/hugolib/filesystems/basefs.go @@ -243,11 +243,11 @@ func (d *SourceFilesystem) MakePathRelative(filename string) string { currentPath := meta.Filename() if strings.HasPrefix(filename, currentPath) { - if path := meta.Path(); path != "" { - currentPath = strings.TrimRight(strings.TrimSuffix(currentPath, path), filePathSeparator) + rel := strings.TrimPrefix(filename, currentPath) + if mp := meta.Path(); mp != "" { + rel = filepath.Join(mp, rel) } - - return strings.TrimPrefix(filename, currentPath) + return strings.TrimPrefix(rel, filePathSeparator) } } return "" |