diff options
| author | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-11-02 00:20:21 +0000 |
|---|---|---|
| committer | Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> | 2010-11-02 00:20:21 +0000 |
| commit | 27049b848dd48eca4df160e6024d66215230d260 (patch) | |
| tree | 5fdc0eaedd653da2a4148cbad7814afefad7489c /script/process | |
| parent | bed79f523bd64d900a4e615efe7eb3e0cfc0abd8 (diff) | |
| download | redmine-27049b848dd48eca4df160e6024d66215230d260.tar.gz redmine-27049b848dd48eca4df160e6024d66215230d260.zip | |
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
Diffstat (limited to 'script/process')
| -rw-r--r-- | script/process/inspector | 2 | ||||
| -rwxr-xr-x | script/process/reaper | 2 | ||||
| -rwxr-xr-x | script/process/spawner | 2 | ||||
| -rwxr-xr-x | script/process/spinner | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/script/process/inspector b/script/process/inspector index bf25ad86d..8bcabb052 100644 --- a/script/process/inspector +++ b/script/process/inspector @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../config/boot', __FILE__) require 'commands/process/inspector' diff --git a/script/process/reaper b/script/process/reaper index c77f04535..aa7c1a053 100755 --- a/script/process/reaper +++ b/script/process/reaper @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../config/boot', __FILE__) require 'commands/process/reaper' diff --git a/script/process/spawner b/script/process/spawner index 7118f3983..69b33594d 100755 --- a/script/process/spawner +++ b/script/process/spawner @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../config/boot', __FILE__) require 'commands/process/spawner' diff --git a/script/process/spinner b/script/process/spinner index 6816b32ef..190c2bec7 100755 --- a/script/process/spinner +++ b/script/process/spinner @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../config/boot', __FILE__) require 'commands/process/spinner' |