From 27049b848dd48eca4df160e6024d66215230d260 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Barth Date: Tue, 2 Nov 2010 00:20:21 +0000 Subject: Use File#expand_path for require's in script/* for Ruby 1.9.2 compatibility. #4050 Since Ruby 1.9.2, LOAD_PATH does not include "." directory anymore, so we should use absolute paths instead to ensure both 1.8.x and 1.9.x compatibility. It has been included in railties 2.3.x branch since july 2009, see http://github.com/rails/rails/commit/7a427a83ca4da92c70760007aaf313638a5d8374 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4359 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- script/server | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'script/server') diff --git a/script/server b/script/server index dfabcb881..b9fcb7179 100755 --- a/script/server +++ b/script/server @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/boot' -require 'commands/server' \ No newline at end of file +require File.expand_path('../../config/boot', __FILE__) +require 'commands/server' -- cgit v1.2.3