Merge pull request #1444 from chrisnicotera/master
Fix docs server options override
This commit is contained in:
		
						commit
						1b40226cfd
					
				|  | @ -122,10 +122,10 @@ command :docs do |c| | |||
| 
 | ||||
|   c.action do |args, options| | ||||
|     options = normalize_options(options.__hash__) | ||||
|     options = Jekyll.configuration(options).merge({ | ||||
|     options = Jekyll.configuration(options.merge!({ | ||||
|       'source' => File.expand_path("../site", File.dirname(__FILE__)), | ||||
|       'destination' => File.expand_path("../site/_site", File.dirname(__FILE__)) | ||||
|     }) | ||||
|     })) | ||||
|     puts options | ||||
|     Jekyll::Commands::Build.process(options) | ||||
|     Jekyll::Commands::Serve.process(options) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue