moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-11-16 06:05:00 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brandon Mathis 2013-03-18 02:00:30 -05:00
parent 463e4a7656
commit 940064cac6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/octopress.rb
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