Remove 'cache_dir' during `jekyll clean` (#7158)

Merge pull request 7158
This commit is contained in:
Pat Hawks 2018-07-31 15:12:57 -05:00 committed by jekyllbot
parent 37c9347422
commit 6e980f3f6a
2 changed files with 3 additions and 0 deletions

View File

@ -22,10 +22,12 @@ module Jekyll
options = configuration_from_options(options) options = configuration_from_options(options)
destination = options["destination"] destination = options["destination"]
metadata_file = File.join(options["source"], ".jekyll-metadata") metadata_file = File.join(options["source"], ".jekyll-metadata")
cache_dir = File.join(options["source"], options["cache_dir"])
sass_cache = ".sass-cache" sass_cache = ".sass-cache"
remove(destination, :checker_func => :directory?) remove(destination, :checker_func => :directory?)
remove(metadata_file, :checker_func => :file?) remove(metadata_file, :checker_func => :file?)
remove(cache_dir, :checker_func => :directory?)
remove(sass_cache, :checker_func => :directory?) remove(sass_cache, :checker_func => :directory?)
end end

View File

@ -9,6 +9,7 @@ module Jekyll
"source" => Dir.pwd, "source" => Dir.pwd,
"destination" => File.join(Dir.pwd, "_site"), "destination" => File.join(Dir.pwd, "_site"),
"collections_dir" => "", "collections_dir" => "",
"cache_dir" => ".jekyll-cache",
"plugins_dir" => "_plugins", "plugins_dir" => "_plugins",
"layouts_dir" => "_layouts", "layouts_dir" => "_layouts",
"data_dir" => "_data", "data_dir" => "_data",