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

Merge pull request #935 from mojombo/baseurl-normalization 

Fix cascade problem with site.baseurl.
This commit is contained in:
Parker Moore 2013-04-07 15:19:23 -07:00
parent 90366941a2 dbb3dd3a1a
commit b667a6a1a8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/jekyll
View File

@ -75,10 +75,7 @@ command :serve do |c|
c.option '-b', '--baseurl [URL]', 'Base URL' c.option '-b', '--baseurl [URL]', 'Base URL'
c.action do |args, options| c.action do |args, options|
options.default :port => '4000', options.default :serving => true
:host => '0.0.0.0',
:baseurl => '/',
:serving => true
options = normalize_options(options.__hash__) options = normalize_options(options.__hash__)
options = Jekyll.configuration(options) options = Jekyll.configuration(options)

7
lib/jekyll.rb
View File

@ -64,17 +64,20 @@ module Jekyll
'keep_files' => ['.git','.svn'], 'keep_files' => ['.git','.svn'],
'future' => true, # remove and make true just default 'future' => true, # remove and make true just default
'pygments' => true, # remove and make true just default 'pygments' => true, # remove and make true just default
'markdown' => 'maruku', 'markdown' => 'maruku',
'permalink' => 'date', 'permalink' => 'date',
'baseurl' => '', 'baseurl' => '/',
'include' => ['.htaccess'], 'include' => ['.htaccess'],
'paginate_path' => 'page:num', 'paginate_path' => 'page:num',
'markdown_ext' => 'markdown,mkd,mkdn,md', 'markdown_ext' => 'markdown,mkd,mkdn,md',
'textile_ext' => 'textile', 'textile_ext' => 'textile',
'port' => '4000',
'host' => '0.0.0.0',
'excerpt_separator' => "\n\n", 'excerpt_separator' => "\n\n",
'maruku' => { 'maruku' => {