dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete old files that have been replaced by a directory 

Fixes #417.
Replaces #1086, more logical code.
This commit is contained in:
maul.esel 2013-05-17 17:45:51 +02:00
parent d1c626f2e2
commit 96efa9ed06
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jekyll/site.rb
View File

@ -270,7 +270,11 @@ module Jekyll
files.each { |file| dirs << File.dirname(file) } files.each { |file| dirs << File.dirname(file) }
files.merge(dirs) files.merge(dirs)
obsolete_files = dest_files - files # files that are replaced by dirs should be deleted
files_to_delete = Set.new
dirs.each { |dir| files_to_delete << dir if File.file?(dir) }
obsolete_files = dest_files - files + files_to_delete
FileUtils.rm_rf(obsolete_files.to_a) FileUtils.rm_rf(obsolete_files.to_a)
end end