diff options
Diffstat (limited to 'cmd/build/main.go')
| -rw-r--r-- | cmd/build/main.go | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/cmd/build/main.go b/cmd/build/main.go index ee61a68..84de2dc 100644 --- a/cmd/build/main.go +++ b/cmd/build/main.go @@ -4,23 +4,24 @@ import ( "fmt" "os" - "website/internal/builder" - "website/internal/log" + "go.alanpearce.eu/website/internal/builder" + "go.alanpearce.eu/website/internal/config" + "go.alanpearce.eu/x/log" "github.com/ardanlabs/conf/v3" - "github.com/pkg/errors" + "gitlab.com/tozd/go/errors" ) func main() { - ioConfig := builder.IOConfig{} - if help, err := conf.Parse("", &ioConfig); err != nil { + ioConfig := &builder.IOConfig{} + if help, err := conf.Parse("", ioConfig); err != nil { if errors.Is(err, conf.ErrHelpWanted) { fmt.Println(help) os.Exit(1) } panic("error parsing configuration: " + err.Error()) } - log.Configure(!ioConfig.Development) + log := log.Configure(!ioConfig.Development) log.Debug("starting build process") if ioConfig.Source != "." { @@ -29,7 +30,12 @@ func main() { log.Panic("could not change to source directory") } } - _, err := builder.BuildSite(ioConfig) + cfg, err := config.GetConfig(ioConfig.Source, log) + if err != nil { + log.Error("could not read config", "error", err) + } + + _, err = builder.BuildSite(ioConfig, cfg, log) if err != nil { log.Error("could not build site", "error", err) os.Exit(1) |