ref: 4f2dfe7015635f19aeb88924769b25b5e0c60358
parent: 7badd2eb0c4a300f8cbbf88b9ec83cd31f193598
author: Joel Scoble <[email protected]>
date: Thu Nov 6 05:06:29 EST 2014
converted path 2 filepath
--- a/target/file.go
+++ b/target/file.go
@@ -2,7 +2,7 @@
import (
"io"
- "path"
+ "path/filepath"
"github.com/spf13/hugo/helpers"
"github.com/spf13/hugo/hugofs"
@@ -35,7 +35,7 @@
}
func (fs *Filesystem) Translate(src string) (dest string, err error) {- return path.Join(fs.PublishDir, src), nil
+ return filepath.Join(fs.PublishDir, src), nil
}
func (fs *Filesystem) extension(ext string) string {@@ -43,7 +43,7 @@
}
func filename(f string) string {- ext := path.Ext(f)
+ ext := filepath.Ext(f)
if ext == "" {return f
}
--- a/target/htmlredirect.go
+++ b/target/htmlredirect.go
@@ -3,7 +3,7 @@
import (
"bytes"
"html/template"
- "path"
+ "path/filepath"
"strings"
"github.com/spf13/hugo/helpers"
@@ -41,7 +41,7 @@
} else if !strings.HasSuffix(alias, ".html") {alias = alias + "/index.html"
}
- return path.Join(h.PublishDir, helpers.MakePath(alias)), nil
+ return filepath.Join(h.PublishDir, helpers.MakePath(alias)), nil
}
type AliasNode struct {--- a/target/page.go
+++ b/target/page.go
@@ -4,7 +4,7 @@
"fmt"
"html/template"
"io"
- "path"
+ "path/filepath"
"github.com/spf13/hugo/helpers"
"github.com/spf13/hugo/hugofs"
@@ -34,23 +34,23 @@
func (pp *PagePub) Translate(src string) (dest string, err error) { if src == "/" { if pp.PublishDir != "" {- return path.Join(pp.PublishDir, "index.html"), nil
+ return filepath.Join(pp.PublishDir, "index.html"), nil
}
return "index.html", nil
}
- dir, file := path.Split(src)
- ext := pp.extension(path.Ext(file))
+ dir, file := filepath.Split(src)
+ ext := pp.extension(filepath.Ext(file))
name := filename(file)
if pp.PublishDir != "" {- dir = path.Join(pp.PublishDir, dir)
+ dir = filepath.Join(pp.PublishDir, dir)
}
if pp.UglyUrls || file == "index.html" {- return path.Join(dir, fmt.Sprintf("%s%s", name, ext)), nil+ return filepath.Join(dir, fmt.Sprintf("%s%s", name, ext)), nil}
- return path.Join(dir, name, fmt.Sprintf("index%s", ext)), nil+ return filepath.Join(dir, name, fmt.Sprintf("index%s", ext)), nil}
func (pp *PagePub) extension(ext string) string {