lib/conf/default.rb in rsence-2.0.9.21.pre vs lib/conf/default.rb in rsence-2.0.9.22.pre
- old
+ new
@@ -202,14 +202,14 @@
unless config[:index_html].has_key?(:respond_address)
config[:index_html][:respond_address] = File.join(config[:base_url])
end
## Uses the lib paths as search paths
- lib_paths.merge( config[:lib_paths] ) if config.has_key?(:lib_paths)
+ lib_paths += config[:lib_paths] if config.has_key?(:lib_paths)
lib_paths.each do |lib_path|
+ lib_path = File.expand_path( lib_path, args[:env_path] ) if lib_path.start_with? './'
$LOAD_PATH << lib_path
end
-
@config = config
end
attr_reader :config