Move HugoSites to hugolib

It will get more involved in the build process in a minute.

See #2309

2 files changed, 3 insertions, 13 deletions

diff --git a/commands/hugo.go b/commands/hugo.go
index 6168d0a83..b8e4ea643 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -46,20 +46,10 @@ import (
 	"github.com/spf13/viper"
 )
 
-type HugoSites []*hugolib.Site
-
-// Reset resets the sites, making it ready for a full rebuild.
-// TODO(bep) multilingo
-func (h HugoSites) Reset() {
-	for i, s := range h {
-		h[i] = s.Reset()
-	}
-}
-
 // Hugo represents the Hugo sites to build. This variable is exported as it
 // is used by at least one external library (the Hugo caddy plugin). We should
 // provide a cleaner external API, but until then, this is it.
-var Hugo HugoSites
+var Hugo hugolib.HugoSites
 
 // Reset resets Hugo ready for a new full build. This is mainly only useful
 // for benchmark testing etc. via the CLI commands.
diff --git a/commands/multilingual.go b/commands/multilingual.go
index 9afb562ba..7c43d15bc 100644
--- a/commands/multilingual.go
+++ b/commands/multilingual.go
@@ -11,8 +11,8 @@ import (
 	"github.com/spf13/viper"
 )
 
-func readMultilingualConfiguration() (HugoSites, error) {
-	h := make(HugoSites, 0)
+func readMultilingualConfiguration() (hugolib.HugoSites, error) {
+	h := make(hugolib.HugoSites, 0)
 	multilingual := viper.GetStringMap("Multilingual")
 	if len(multilingual) == 0 {
 		// TODO(bep) multilingo langConfigsList = append(langConfigsList, hugolib.NewLanguage("en"))