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

Merge pull request #1444 from chrisnicotera/master 

Fix docs server options override
This commit is contained in:
Matt Rogers 2013-08-24 09:07:33 -07:00
parent 07d23535af 4b4103cc4a
commit 1b40226cfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/jekyll
View File

@ -122,10 +122,10 @@ command :docs do |c|
c.action do |args, options| c.action do |args, options|
options = normalize_options(options.__hash__) options = normalize_options(options.__hash__)
options = Jekyll.configuration(options).merge({ options = Jekyll.configuration(options.merge!({
'source' => File.expand_path("../site", File.dirname(__FILE__)), 'source' => File.expand_path("../site", File.dirname(__FILE__)),
'destination' => File.expand_path("../site/_site", File.dirname(__FILE__)) 'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
}) }))
puts options puts options
Jekyll::Commands::Build.process(options) Jekyll::Commands::Build.process(options)
Jekyll::Commands::Serve.process(options) Jekyll::Commands::Serve.process(options)