From: René Jochum <rene@jochums.at>
Date: Tue, 17 Feb 2015 21:21:37 +0000 (+0100)
Subject: Suppress errors for symbolic links witch point to a file.
X-Git-Tag: v0.13~9
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2e022f2;p=brevno-suite%2Fhugo

Suppress errors for symbolic links witch point to a file.
---

diff --git a/commands/hugo.go b/commands/hugo.go
index 986036e7..1b19c34a 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -300,7 +300,19 @@ func getDirList() []string {
 		}
 
 		if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
-			jww.ERROR.Printf("Symbolic links not supported, skipping '%s'", path)
+			link, err := filepath.EvalSymlinks(path)
+			if err != nil {
+				jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", path, err)
+				return nil
+			}
+			linkfi, err := os.Stat(link)
+			if err != nil {
+				jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
+				return nil
+			}
+			if !linkfi.Mode().IsRegular() {
+				jww.ERROR.Printf("Symbolic links for directories not supported, skipping '%s'", path)
+			}
 			return nil
 		}
 
diff --git a/source/filesystem.go b/source/filesystem.go
index df0a4989..597d8c7a 100644
--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -15,13 +15,14 @@ package source
 
 import (
 	"bytes"
-	"github.com/spf13/hugo/helpers"
-	jww "github.com/spf13/jwalterweatherman"
 	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/spf13/hugo/helpers"
+	jww "github.com/spf13/jwalterweatherman"
 )
 
 type Input interface {
@@ -85,7 +86,19 @@ func (f *Filesystem) captureFiles() {
 		}
 
 		if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
-			jww.ERROR.Printf("Symbolic links not supported, skipping '%s'", filePath)
+			link, err := filepath.EvalSymlinks(filePath)
+			if err != nil {
+				jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", filePath, err)
+				return nil
+			}
+			linkfi, err := os.Stat(link)
+			if err != nil {
+				jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
+				return nil
+			}
+			if !linkfi.Mode().IsRegular() {
+				jww.ERROR.Printf("Symbolic links for directories not supported, skipping '%s'", filePath)
+			}
 			return nil
 		}
 
diff --git a/tpl/template.go b/tpl/template.go
index 320f969c..08360350 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -1222,7 +1222,19 @@ func (t *GoHtmlTemplate) loadTemplates(absPath string, prefix string) {
 		}
 
 		if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
-			jww.ERROR.Printf("Symbolic links not supported, skipping '%s'", absPath)
+			link, err := filepath.EvalSymlinks(absPath)
+			if err != nil {
+				jww.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", absPath, err)
+				return nil
+			}
+			linkfi, err := os.Stat(link)
+			if err != nil {
+				jww.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
+				return nil
+			}
+			if !linkfi.Mode().IsRegular() {
+				jww.ERROR.Printf("Symbolic links for directories not supported, skipping '%s'", absPath)
+			}
 			return nil
 		}