Changeset 292
- Timestamp:
- 12/16/07 20:32:33 (10 months ago)
- Files:
-
- trunk/plugin/acts_as_ferret/lib/server_manager.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/plugin/acts_as_ferret/lib/server_manager.rb
r280 r292 6 6 'environment' => nil, 7 7 'debug' => nil, 8 'root' => nil 8 9 } 9 10 … … 15 16 puts optparser 16 17 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 17 22 end 18 23 … … 37 42 ENV['RAILS_ENV'] = $ferret_server_options['environment'] 38 43 #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 40 49 require 'acts_as_ferret' 41 50 ActsAsFerret::Remote::Server.new.send($ferret_server_action)
