From 61258858af90fc43bea406af5f065d0b2e6c94dc Mon Sep 17 00:00:00 2001 From: spf13 Date: Tue, 30 Jul 2013 01:26:02 -0400 Subject: [PATCH] copying static content to destination --- main.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index f99357c1f..2a7585242 100644 --- a/main.go +++ b/main.go @@ -16,8 +16,10 @@ package main import ( "fmt" "github.com/howeyc/fsnotify" + "github.com/mostafah/fsync" flag "github.com/ogier/pflag" "github.com/spf13/hugo/hugolib" + "log" "net/http" "os" "path/filepath" @@ -63,16 +65,16 @@ func main() { config.UglyUrls = *uglyUrls config.Verbose = *verbose - if *destination != "" { - config.PublishDir = *destination - } - if *baseUrl != "" { config.BaseUrl = *baseUrl } else if *server { config.BaseUrl = "http://localhost:" + *port } + if *destination != "" { + config.PublishDir = *destination + } + if *version { fmt.Println("Hugo Static Site Generator v0.8") } @@ -92,6 +94,12 @@ func main() { } } + // Copy Static to Destination first + err := fsync.SyncDel(config.GetAbsPath(config.PublishDir+"/"), config.GetAbsPath(config.StaticDir+"/")) + if err != nil { + log.Fatalf("Error copying static files to %s: %v", config.GetAbsPath(config.PublishDir), err) + } + if *checkMode { site := hugolib.NewSite(config) site.Analyze()