aboutsummaryrefslogtreecommitdiff
path: root/forged/internal
diff options
context:
space:
mode:
Diffstat (limited to 'forged/internal')
-rw-r--r--forged/internal/embed/.gitignore1
-rw-r--r--forged/internal/embed/embed.go2
-rw-r--r--forged/internal/unsorted/resources.go2
-rw-r--r--forged/internal/unsorted/server.go2
4 files changed, 4 insertions, 3 deletions
diff --git a/forged/internal/embed/.gitignore b/forged/internal/embed/.gitignore
index b4db111..e8708b1 100644
--- a/forged/internal/embed/.gitignore
+++ b/forged/internal/embed/.gitignore
@@ -4,3 +4,4 @@
/static
/templates
/LICENSE*
+/forged
diff --git a/forged/internal/embed/embed.go b/forged/internal/embed/embed.go
index 68af51d..c9eeeb3 100644
--- a/forged/internal/embed/embed.go
+++ b/forged/internal/embed/embed.go
@@ -9,6 +9,6 @@ import "embed"
//go:embed LICENSE* source.tar.gz
var Source embed.FS
-//go:embed templates/* static/*
+//go:embed forged/templates/* forged/static/*
//go:embed hookc/hookc git2d/git2d
var Resources embed.FS
diff --git a/forged/internal/unsorted/resources.go b/forged/internal/unsorted/resources.go
index 9f3a5d0..692b454 100644
--- a/forged/internal/unsorted/resources.go
+++ b/forged/internal/unsorted/resources.go
@@ -30,7 +30,7 @@ func (s *Server) loadTemplates() (err error) {
"minus": misc.Minus,
})
- err = fs.WalkDir(embed.Resources, "templates", func(path string, d fs.DirEntry, err error) error {
+ err = fs.WalkDir(embed.Resources, "forged/templates", func(path string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
diff --git a/forged/internal/unsorted/server.go b/forged/internal/unsorted/server.go
index f8978a5..c7caa76 100644
--- a/forged/internal/unsorted/server.go
+++ b/forged/internal/unsorted/server.go
@@ -63,7 +63,7 @@ func NewServer(configPath string) (*Server, error) {
"/-/source/",
http.FileServer(http.FS(embed.Source)),
)
- staticFS, err := fs.Sub(embed.Resources, "static")
+ staticFS, err := fs.Sub(embed.Resources, "forged/static")
if err != nil {
return s, err
}