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

fix backup file ignore merge

This commit is contained in:
Tom Preston-Werner 2008-12-24 15:36:47 -08:00
parent d435eaae5f d85c0d3236
commit 9fb1f6e7c8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jekyll/site.rb
View File

@ -28,13 +28,14 @@ module Jekyll
self.write_posts self.write_posts
end end
# Read all the files in <source>/_layouts into memory for # Read all the files in <source>/_layouts except backup files
# later use. # (end with "~") into memory for later use.
# #
# Returns nothing # Returns nothing
def read_layouts def read_layouts
base = File.join(self.source, "_layouts") base = File.join(self.source, "_layouts")
entries = Dir.entries(base) entries = Dir.entries(base)
entries = entries.reject { |e| e[-1..-1] == '~' }
entries = entries.reject { |e| File.directory?(File.join(base, e)) } entries = entries.reject { |e| File.directory?(File.join(base, e)) }
entries.each do |f| entries.each do |f|
@ -45,8 +46,8 @@ module Jekyll
# ignore missing layout dir # ignore missing layout dir
end end
# Read all the files in <base>/_posts and create a new Post # Read all the files in <base>/_posts except backup files (end with "~")
# object with each one. # and create a new Post object with each one.
# #
# Returns nothing # Returns nothing
def read_posts(dir) def read_posts(dir)
@ -54,6 +55,7 @@ module Jekyll
entries = [] entries = []
Dir.chdir(base) { entries = Dir['**/*'] } Dir.chdir(base) { entries = Dir['**/*'] }
entries = entries.reject { |e| e[-1..-1] == '~' }
entries = entries.reject { |e| File.directory?(File.join(base, e)) } entries = entries.reject { |e| File.directory?(File.join(base, e)) }
# first pass processes, but does not yet render post content # first pass processes, but does not yet render post content
@ -84,8 +86,9 @@ module Jekyll
end end
# Copy all regular files from <source> to <dest>/ ignoring # Copy all regular files from <source> to <dest>/ ignoring
# any files/directories that are hidden (start with ".") or contain # any files/directories that are hidden or backup files (start
# site content (start with "_") unless they are "_posts" directories # with "." or end with "~") or contain site content (start with "_")
# unless they are "_posts" directories
# The +dir+ String is a relative path used to call this method # The +dir+ String is a relative path used to call this method
# recursively as it descends through directories # recursively as it descends through directories
# #
@ -93,6 +96,7 @@ module Jekyll
def transform_pages(dir = '') def transform_pages(dir = '')
base = File.join(self.source, dir) base = File.join(self.source, dir)
entries = Dir.entries(base) entries = Dir.entries(base)
entries = entries.reject { |e| e[-1..-1] == '~' }
entries = entries.reject do |e| entries = entries.reject do |e|
(e != '_posts') and ['.', '_'].include?(e[0..0]) (e != '_posts') and ['.', '_'].include?(e[0..0])
end end