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

Merge commit '01828dada88a6ce2ebd72268c87d79d7bd60a3fd'

This commit is contained in:
Tom Preston-Werner 2008-12-10 16:03:56 -08:00
parent 9e764a6445 01828dada8
commit 1e13d2f91f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll/site.rb
View File

@ -54,7 +54,7 @@ module Jekyll
base = File.join(self.source, "_posts") base = File.join(self.source, "_posts")
entries = Dir.entries(base) entries = Dir.entries(base)
entries = entries.reject { |e| File.directory?(e) } entries = entries.reject { |e| File.directory?(e) }
entries.each do |f| entries.each do |f|
self.posts << Post.new(base, f) if Post.valid?(f) self.posts << Post.new(base, f) if Post.valid?(f)
end end
@ -85,9 +85,10 @@ module Jekyll
base = File.join(self.source, dir) base = File.join(self.source, dir)
entries = Dir.entries(base) entries = Dir.entries(base)
entries = entries.reject { |e| ['.', '_'].include?(e[0..0]) } entries = entries.reject { |e| ['.', '_'].include?(e[0..0]) }
entries.each do |f| entries.each do |f|
if File.directory?(File.join(base, f)) if File.directory?(File.join(base, f))
next if self.dest.sub(/\/$/, '') == File.join(base, f)
transform_pages(File.join(dir, f)) transform_pages(File.join(dir, f))
else else
first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) } first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
@ -114,4 +115,4 @@ module Jekyll
end end
end end
end end