To edit pages or tickets please login with username/password: aaf/aaf

Changeset 292

Show
Ignore:
Timestamp:
12/16/07 20:32:33 (10 months ago)
Author:
jk
Message:

applied patch from #185

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/plugin/acts_as_ferret/lib/server_manager.rb

    r280 r292  
    66  'environment' => nil, 
    77  'debug'       => nil, 
     8  'root'        => nil 
    89} 
    910 
     
    1516    puts optparser 
    1617    exit 
     18  end 
     19   
     20  optparser.on('-R', '--root=PATH', 'Set RAILS_ROOT to the given string') do |r| 
     21    $ferret_server_options['root'] = r 
    1722  end 
    1823 
     
    3742  ENV['RAILS_ENV'] = $ferret_server_options['environment'] 
    3843  #require(File.join(File.dirname(__FILE__), '../../../../config/environment')) 
    39   require(File.join(File.dirname(ENV['_']), '../config/environment')) 
     44  if $ferret_server_options['root'] 
     45    require File.join($ferret_server_options['root'], 'config', 'environment') 
     46  else 
     47    require(File.join(File.dirname(ENV['_']), '../config/environment')) 
     48  end 
    4049  require 'acts_as_ferret' 
    4150  ActsAsFerret::Remote::Server.new.send($ferret_server_action) 

To edit pages or tickets please login with username/password: aaf/aaf