commands: Suppress 'missing static' error
authorKishin Yagami <k.yagami.suou@gmail.com>
Sat, 13 Aug 2016 22:35:43 +0000 (07:35 +0900)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 13 Aug 2016 22:35:43 +0000 (00:35 +0200)
Fixes #2311

commands/hugo.go

index 1b2b3b3c73440649f88acd76b836b0ad080f4ac4..d72c6acee844a04efeb0570452f1f320fd6632a7 100644 (file)
@@ -625,6 +625,7 @@ func getDirList() []string {
        var a []string
        dataDir := helpers.AbsPathify(viper.GetString("DataDir"))
        layoutDir := helpers.AbsPathify(viper.GetString("LayoutDir"))
+       staticDir := helpers.AbsPathify(viper.GetString("StaticDir"))
        walker := func(path string, fi os.FileInfo, err error) error {
                if err != nil {
                        if path == dataDir && os.IsNotExist(err) {
@@ -635,8 +636,13 @@ func getDirList() []string {
                        if path == layoutDir && os.IsNotExist(err) {
                                jww.WARN.Println("Skip LayoutDir:", err)
                                return nil
+                       }
 
+                       if path == staticDir && os.IsNotExist(err) {
+                               jww.WARN.Println("Skip StaticDir:", err)
+                               return nil
                        }
+
                        jww.ERROR.Println("Walker: ", err)
                        return nil
                }
@@ -671,7 +677,7 @@ func getDirList() []string {
        helpers.SymbolicWalk(hugofs.Source(), dataDir, walker)
        helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("ContentDir")), walker)
        helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("LayoutDir")), walker)
-       helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("StaticDir")), walker)
+       helpers.SymbolicWalk(hugofs.Source(), staticDir, walker)
        if helpers.ThemeSet() {
                helpers.SymbolicWalk(hugofs.Source(), helpers.AbsPathify(viper.GetString("themesDir")+"/"+viper.GetString("theme")), walker)
        }