Changeset 1266

Show
Ignore:
Timestamp:
01/10/08 12:30:35 (9 months ago)
Author:
in..@loobmedia.com
Message:

fixed Rake related MERB_ENV

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/Rakefile

    r1235 r1266  
    99require 'fileutils' 
    1010 
    11 Merb.environment = ENV['Merb.environment'] if ENV['Merb.environment'] 
    12 $RAKE_ENV = true 
     11Merb.environment = ENV['MERB_ENV'] if ENV['MERB_ENV'] 
    1312 
    1413require File.dirname(__FILE__)+'/config/boot.rb' 

  • trunk/lib/tasks/merb.rake

    r1239 r1266  
    4949  require 'rubygems'  
    5050  require 'merb'  
    51   Merb::Config[:environment] = ENV['Merb.environment'] if ENV['Merb.environment']  
     51  Merb::Config[:environment] = ENV['MERB_ENV'] if ENV['MERB_ENV']  
    5252  Merb.environment  = Merb::Config[:environment].nil? ? 'development' : Merb::Config[:environment]  
    5353  load Merb.root+'/config/merb_init.rb'