shithub: hugo

Info  •  Files  •  Log  •  Branches

Formatting cleanup

--- a/hugolib/indexing_test.go

+++ b/hugolib/indexing_test.go

@@ -1,8 +1,8 @@

 package hugolib

 import (

-	"testing"

 	"strings"

+	"testing"

 )

 func TestSitePossibleIndexes(t *testing.T) {

@@ -14,5 +14,3 @@

 		t.Fatalf("possible indexes do not match [tags categories].  Got: %s", indexes)

 	}

 }

-

-

--- a/hugolib/site.go

+++ b/hugolib/site.go

@@ -326,9 +326,9 @@

 	if len(strings.TrimSpace(p.Slug)) > 0 {

 		// Use Slug if provided

 		if s.Config.UglyUrls {

-			outfile = p.Slug + "." + p.Extension

+			outfile = strings.TrimSpace(p.Slug) + "." + p.Extension

 		} else {

-			outfile = p.Slug + slash + "index." + p.Extension

+			outfile = filepath.Join(strings.TrimSpace(p.Slug), "index."+p.Extension)

 		}

 	} else {

 		// Fall back to filename

@@ -337,7 +337,7 @@

 			outfile = replaceExtension(strings.TrimSpace(t), p.Extension)

 		} else {

 			file, _ := fileExt(strings.TrimSpace(t))

-			outfile = file + slash + "index." + p.Extension

+			outfile = filepath.Join(file, "index."+p.Extension)

 		}

 	}