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

Revert "Use more efficient merging" 

This reverts commit 78df4ddb70.
This commit is contained in:
Christopher Nicotera 2013-08-22 11:29:23 -04:00
parent 78df4ddb70
commit fb1003c06f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/jekyll
View File

@ -121,10 +121,12 @@ command :docs do |c|
c.option '-u', '--host [HOST]', 'Host to bind to' c.option '-u', '--host [HOST]', 'Host to bind to'
c.action do |args, options| c.action do |args, options|
options = Jekyll.configuration(normalize_options(options.__hash__).merge!({ options = normalize_options(options.__hash__)
options = 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__))
})) })
options = Jekyll.configuration(options)
puts options puts options
Jekyll::Commands::Build.process(options) Jekyll::Commands::Build.process(options)
Jekyll::Commands::Serve.process(options) Jekyll::Commands::Serve.process(options)