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

Merge commit '7655c745c46559d7598b5558fc9bf6fa8b215e28'

This commit is contained in:
Tom Preston-Werner 2009-03-10 16:15:32 -07:00
parent 2b925baf01 7655c745c4
commit fa1043ca69
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jekyll/post.rb
View File

@ -83,7 +83,8 @@ module Jekyll
permalink.to_s.split("/")[0..-2].join("/") + '/' permalink.to_s.split("/")[0..-2].join("/") + '/'
else else
prefix = self.categories.empty? ? '' : '/' + self.categories.join('/') prefix = self.categories.empty? ? '' : '/' + self.categories.join('/')
if Jekyll.permalink_style == :date if Jekyll.permalink_style == :date ||
Jekyll.permalink_style == :pretty
prefix + date.strftime("/%Y/%m/%d/") prefix + date.strftime("/%Y/%m/%d/")
else else
prefix + '/' prefix + '/'
@ -105,7 +106,8 @@ module Jekyll
# #
# Returns <String> # Returns <String>
def url def url
permalink || self.dir + self.slug + ".html" permalink || self.id +
( ".html" unless Jekyll.permalink_style == :pretty ).to_s
end end
# The UID for this post (useful in feeds) # The UID for this post (useful in feeds)
@ -163,6 +165,12 @@ module Jekyll
FileUtils.mkdir_p(File.join(dest, dir)) FileUtils.mkdir_p(File.join(dest, dir))
path = File.join(dest, self.url) path = File.join(dest, self.url)
if Jekyll.permalink_style == :pretty
FileUtils.mkdir_p(path)
path = File.join(path, "index.html")
end
File.open(path, 'w') do |f| File.open(path, 'w') do |f|
f.write(self.output) f.write(self.output)
end end