From: satotake Date: Sat, 21 May 2022 18:41:28 +0000 (+0900) Subject: import: Fix importing jekyll site X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fc2e9c87;p=brevno-suite%2Fhugo import: Fix importing jekyll site Just use `afero.OsFs` without building site. Close #9817 --- diff --git a/commands/import_jekyll.go b/commands/import_jekyll.go index 232df519c..91d5c69fe 100644 --- a/commands/import_jekyll.go +++ b/commands/import_jekyll.go @@ -36,7 +36,6 @@ import ( "github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/hugofs" - "github.com/gohugoio/hugo/hugolib" "github.com/gohugoio/hugo/parser" "github.com/spf13/afero" "github.com/spf13/cobra" @@ -202,12 +201,7 @@ func (i *importCmd) retrieveJekyllPostDir(fs afero.Fs, dir string) (bool, bool) } func (i *importCmd) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool, force bool) error { - s, err := hugolib.NewSiteDefaultLang() - if err != nil { - return err - } - - fs := s.Fs.Source + fs := &afero.OsFs{} if exists, _ := helpers.Exists(targetDir, fs); exists { if isDir, _ := helpers.IsDir(targetDir, fs); !isDir { return errors.New("target path \"" + targetDir + "\" exists but is not a directory")