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

Use Dir.pwd for other default paths as well (reverts fix in #101)

This commit is contained in:
Tom Preston-Werner 2010-06-22 16:22:58 -07:00
parent 36411dd10f
commit de3ee99d30
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
History.txt
View File

@ -16,14 +16,13 @@
* Only regenerate static files when they have changed (#142) * Only regenerate static files when they have changed (#142)
* Allow arbitrary options to Pygments (#31) * Allow arbitrary options to Pygments (#31)
* Allow URL to be set via command line option (#147) * Allow URL to be set via command line option (#147)
* Fix source directory binding using Dir.pwd (#75)
* Bug Fixes * Bug Fixes
* Render highlighted code for non markdown/textile pages (#116) * Render highlighted code for non markdown/textile pages (#116)
* Expand source to full path so includes work anywhere (#101)
* Fix highlighting on Ruby 1.9 (#65) * Fix highlighting on Ruby 1.9 (#65)
* Fix extension munging when pretty permalinks are enabled (#64) * Fix extension munging when pretty permalinks are enabled (#64)
* Stop sorting categories (#33) * Stop sorting categories (#33)
* Preserve generated attributes over front matter (#119) * Preserve generated attributes over front matter (#119)
* Fix source directory binding using Dir.pwd (#75)
== 0.5.7 / 2010-01-12 == 0.5.7 / 2010-01-12
* Minor Enhancements * Minor Enhancements

4
lib/jekyll.rb
View File

@ -56,8 +56,8 @@ module Jekyll
'server_port' => 4000, 'server_port' => 4000,
'source' => Dir.pwd, 'source' => Dir.pwd,
'destination' => File.join('.', '_site'), 'destination' => File.join(Dir.pwd, '_site'),
'plugins' => File.join('.', '_plugins'), 'plugins' => File.join(Dir.pwd, '_plugins'),
'future' => true, 'future' => true,
'lsi' => false, 'lsi' => false,

4
lib/jekyll/site.rb
View File

@ -14,9 +14,9 @@ module Jekyll
self.config = config.clone self.config = config.clone
self.safe = config['safe'] self.safe = config['safe']
self.source = File.expand_path(config['source']) self.source = config['source']
self.dest = config['destination'] self.dest = config['destination']
self.plugins = File.expand_path(config['plugins']) self.plugins = config['plugins']
self.lsi = config['lsi'] self.lsi = config['lsi']
self.pygments = config['pygments'] self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym self.permalink_style = config['permalink'].to_sym