From a721dae0a829b86c363b75b1a58b6a559e12e740 Mon Sep 17 00:00:00 2001 From: Christopher Nicotera Date: Wed, 21 Aug 2013 23:53:30 -0400 Subject: [PATCH 1/4] Fix docs server options override Override the source and destination before passing it along to the configuration --- bin/jekyll | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/jekyll b/bin/jekyll index bfe13068..de5b51d3 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -122,10 +122,11 @@ command :docs do |c| c.action do |args, options| options = normalize_options(options.__hash__) - options = Jekyll.configuration(options).merge({ + options = options.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) From 78df4ddb704f6fd11dcf2c98d4c9ca2260dbab8e Mon Sep 17 00:00:00 2001 From: Christopher Nicotera Date: Thu, 22 Aug 2013 11:27:30 -0400 Subject: [PATCH 2/4] 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) From fb1003c06f728f0615f944707aa59ce7e3951b5d Mon Sep 17 00:00:00 2001 From: Christopher Nicotera Date: Thu, 22 Aug 2013 11:29:23 -0400 Subject: [PATCH 3/4] Revert "Use more efficient merging" This reverts commit 78df4ddb704f6fd11dcf2c98d4c9ca2260dbab8e. --- bin/jekyll | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index cf7d1eec..de5b51d3 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -121,10 +121,12 @@ command :docs do |c| c.option '-u', '--host [HOST]', 'Host to bind to' 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__)), '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) From 4b4103cc4ad1ce7d35b8145d4ee0c9e0bbe00904 Mon Sep 17 00:00:00 2001 From: Christopher Nicotera Date: Thu, 22 Aug 2013 11:31:55 -0400 Subject: [PATCH 4/4] Use more efficient merge --- bin/jekyll | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index de5b51d3..403bfbd9 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -122,11 +122,10 @@ command :docs do |c| c.action do |args, options| options = normalize_options(options.__hash__) - options = options.merge({ + options = Jekyll.configuration(options.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)