Browse files

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

  • Loading branch information...
1 parent 36411dd commit de3ee99d301953f6fcbcf70a496a28014e9f2a74 @mojombo mojombo committed Jun 22, 2010
Showing with 5 additions and 6 deletions.
  1. +1 −2 History.txt
  2. +2 −2 lib/jekyll.rb
  3. +2 −2 lib/jekyll/site.rb
View
3 History.txt
@@ -16,14 +16,13 @@
* Only regenerate static files when they have changed (#142)
* Allow arbitrary options to Pygments (#31)
* Allow URL to be set via command line option (#147)
- * Fix source directory binding using Dir.pwd (#75)
* Bug Fixes
* 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 extension munging when pretty permalinks are enabled (#64)
* Stop sorting categories (#33)
* Preserve generated attributes over front matter (#119)
+ * Fix source directory binding using Dir.pwd (#75)
== 0.5.7 / 2010-01-12
* Minor Enhancements
View
4 lib/jekyll.rb
@@ -56,8 +56,8 @@ module Jekyll
'server_port' => 4000,
'source' => Dir.pwd,
- 'destination' => File.join('.', '_site'),
- 'plugins' => File.join('.', '_plugins'),
+ 'destination' => File.join(Dir.pwd, '_site'),
+ 'plugins' => File.join(Dir.pwd, '_plugins'),
'future' => true,
'lsi' => false,
View
4 lib/jekyll/site.rb
@@ -14,9 +14,9 @@ def initialize(config)
self.config = config.clone
self.safe = config['safe']
- self.source = File.expand_path(config['source'])
+ self.source = config['source']
self.dest = config['destination']
- self.plugins = File.expand_path(config['plugins'])
+ self.plugins = config['plugins']
self.lsi = config['lsi']
self.pygments = config['pygments']
self.permalink_style = config['permalink'].to_sym

0 comments on commit de3ee99

Please sign in to comment.