Ensure that Octopress.env can be set by ENV, _config/defaults/jekyll.yml and _config/site.yml

This commit is contained in:
Brandon Mathis 2013-03-18 02:00:30 -05:00
parent 463e4a7656
commit 940064cac6

View File

@ -9,6 +9,6 @@ module Octopress
# Static: Fetches the Octopress environment
def self.env
configurator = Octopress::Configuration.new
ENV["OCTOPRESS_ENV"] || configurator.read_config("defaults/jekyll.yml")[:env]
ENV["OCTOPRESS_ENV"] || configurator.read_config("defaults/jekyll.yml").deep_merge(configurator.read_config("site.yml"))[:env]
end
end