From a4e0ebceb8e664bf3f6e3dc36df0120a9ea9803e Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 19 Apr 2024 14:47:47 +0200 Subject: build: use same dir for static/rendered output --- cmd/build/build.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/build/build.go b/cmd/build/build.go index 8a8cd68..058b82f 100644 --- a/cmd/build/build.go +++ b/cmd/build/build.go @@ -402,12 +402,11 @@ func outputToFile(output io.Reader, filename ...string) error { return nil } -func build() error { +func build(outDir string) error { config, err := config.GetConfig() if err != nil { return err } - outDir := "public" if err := mkdirp(outDir, "post"); err != nil { return errors.WithMessage(err, "could not create post output directory") } @@ -530,18 +529,19 @@ func main() { log.Panic(errors.Errorf("working directory does not exist: %v", err)) } + outDir := "public" err = os.RemoveAll("public") if err != nil { log.Panic(errors.Errorf("could not remove public directory: %v", err)) } - err = cp.Copy("static", "public", cp.Options{ - PreserveTimes: true, + err = cp.Copy("static", outDir, cp.Options{ + PreserveTimes: true, }) if err != nil { log.Panic(errors.Errorf("could not copy static files: %v", err)) } - if err := build(); err != nil { + if err := build(outDir); err != nil { switch cause := errors.Cause(err).(type) { case *fs.PathError: slog.Info("pathError") -- cgit 1.4.1