Formatting cleanup

diff --git a/hugolib/indexing_test.go b/hugolib/indexing_test.go
index 4d7d04f31609ec761815781b4565fcaa26192dab..8bf74188b56edf4d9e468fd9a08efd87d75cf59c 100644 (file)
--- 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 @@ func TestSitePossibleIndexes(t *testing.T) {
                t.Fatalf("possible indexes do not match [tags categories].  Got: %s", indexes)
        }
 }
-
-

diff --git a/hugolib/site.go b/hugolib/site.go
index a35300d21f6d6ce03f24e281a5a79f2967378116..c9104564a85736948a9f8954d02da7e9cceeceba 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -326,9 +326,9 @@ func (s *Site) setOutFile(p *Page) {
        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 @@ func (s *Site) setOutFile(p *Page) {
                        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)
                }
        }