From 78df4ddb704f6fd11dcf2c98d4c9ca2260dbab8e Mon Sep 17 00:00:00 2001 From: Christopher Nicotera Date: Thu, 22 Aug 2013 11:27:30 -0400 Subject: [PATCH] Use more efficient merging --- bin/jekyll | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index de5b51d3..cf7d1eec 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -121,12 +121,10 @@ command :docs do |c| c.option '-u', '--host [HOST]', 'Host to bind to' c.action do |args, options| - options = normalize_options(options.__hash__) - options = options.merge({ + options = Jekyll.configuration(normalize_options(options.__hash__).merge!({ 'source' => File.expand_path("../site", File.dirname(__FILE__)), 'destination' => File.expand_path("../site/_site", File.dirname(__FILE__)) - }) - options = Jekyll.configuration(options) + })) puts options Jekyll::Commands::Build.process(options) Jekyll::Commands::Serve.process(options)