diff options
Diffstat (limited to 'internal/rosa/state.go')
| -rw-r--r-- | internal/rosa/state.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/internal/rosa/state.go b/internal/rosa/state.go index febde19f..d937d070 100644 --- a/internal/rosa/state.go +++ b/internal/rosa/state.go @@ -1309,9 +1309,9 @@ var ( // RegisterAzalea registers all package declarations from r. The backing // filesystem is directly exposed to azalea pathnames. -func (s *S) RegisterAzalea(r io.Reader, b fs.FS) error { +func (s *S) RegisterAzalea(r io.Reader, name string, b fs.FS) error { var pending []*azalea.Func - if expressions, err := azalea.Parse(r); err != nil { + if expressions, err := azalea.Parse(r, name); err != nil { return err } else { pending = make([]*azalea.Func, len(expressions)) @@ -1354,6 +1354,7 @@ func (s *S) RegisterFS(fsys fs.FS) error { return err } + const prefix = "internal/rosa/package/" var r fs.File for _, dent := range dents { if dent.IsDir() { @@ -1371,7 +1372,7 @@ func (s *S) RegisterFS(fsys fs.FS) error { return err } - err = s.RegisterAzalea(r, sub) + err = s.RegisterAzalea(r, prefix+dent.Name()+"/package.az", sub) if _err := r.Close(); err == nil { err = _err } @@ -1391,7 +1392,7 @@ func (s *S) RegisterFS(fsys fs.FS) error { return err } - err = s.RegisterAzalea(r, fsys) + err = s.RegisterAzalea(r, prefix+dent.Name(), fsys) if _err := r.Close(); err == nil { err = _err } |