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

diff --git a/script/about b/script/about
index 00ae734e3de966cf33d7ef01c33a15626f980a78..61112a0157c5f52e061651f94ae6eb176c64371e 100755 (executable)
--- a/script/about
+++ b/script/about
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
 require 'commands/about'
 

diff --git a/script/breakpointer b/script/breakpointer
index 64af76edd40190569b170f3e02d80ba0cdbcf835..d7db15af9204d0521e3c3dbec5343786bd2a5a1f 100755 (executable)
--- a/script/breakpointer
+++ b/script/breakpointer
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/breakpointer'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/breakpointer'

diff --git a/script/console b/script/console
index 42f28f7d6d3d6510cb88436de2742ca323c51b07..235a1f2780496cc73fcb0f86702ab0b6e895fced 100755 (executable)
--- a/script/console
+++ b/script/console
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/console'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/console'

diff --git a/script/dbconsole b/script/dbconsole
index caa60ce829ad83a80a218144898a758a615611b1..83c8436a9d9003e3030beb0d8af6bd8264c29dfb 100644 (file)
--- a/script/dbconsole
+++ b/script/dbconsole
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'

diff --git a/script/destroy b/script/destroy
index fa0e6fcd0b2b2b4514f9042103e30d9613e64ae5..88d295f7aa0450ce4e43981c277a0697cbf06aba 100755 (executable)
--- a/script/destroy
+++ b/script/destroy
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/destroy'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/destroy'

diff --git a/script/generate b/script/generate
index ef976e09f35cee42521f7c4715550cddd5342bc3..62a8a4c0c533bc691bbefcb2bac15132c04a6a58 100755 (executable)
--- a/script/generate
+++ b/script/generate
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/generate'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/generate'

diff --git a/script/performance/benchmarker b/script/performance/benchmarker
index c842d35d339c45800583a252dc2dbe280d967ad9..3bff809fb39768822da7ebfc3ae8ffd9a8c05722 100755 (executable)
--- a/script/performance/benchmarker
+++ b/script/performance/benchmarker
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'

diff --git a/script/performance/profiler b/script/performance/profiler
index d855ac8b1383a4a320fef98b75f33774e69207f8..07640575cd6fad5543f590e80a827cab50fd68d6 100755 (executable)
--- a/script/performance/profiler
+++ b/script/performance/profiler
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'

diff --git a/script/performance/request b/script/performance/request
index ae3f38c74bc7c4a92c84c06fc5d154f05f7614e0..489e568e6f6f900ba6237c7edcf6b48e108d04a3 100644 (file)
--- a/script/performance/request
+++ b/script/performance/request
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/performance/request'

diff --git a/script/plugin b/script/plugin
index 26ca64c06b26fc7825788af9da56a50abeea0f60..b82201fa83385c3f0867baaacf9790b1069dcac4 100755 (executable)
--- a/script/plugin
+++ b/script/plugin
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/plugin'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/plugin'

diff --git a/script/process/inspector b/script/process/inspector
index bf25ad86d189b6fcbf762ab5118fa40952bec2bc..8bcabb052c6196e2440414763a6f38f526e92be4 100644 (file)
--- 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 c77f04535f97fe2b973707033dbcb48732965842..aa7c1a05357cde2010fcd9f3b37c4778d26a00a3 100755 (executable)
--- 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 7118f3983c75075a6b276d77e060aef68551fb57..69b33594dd1439aea7cdca50b089788a3fe02be9 100755 (executable)
--- 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 6816b32ef4bf62b9dd9d9101540d86890ec05543..190c2bec7fc65edfe4ec788fd6b3e48688381e58 100755 (executable)
--- 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'

diff --git a/script/runner b/script/runner
index ccc30f9d2436b5370ab9d28f15df94694f389a2c..be4c5d4572e9f5f4e01ecf3a038bc26540bd1a50 100755 (executable)
--- a/script/runner
+++ b/script/runner
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/runner'
\ No newline at end of file
+require File.expand_path('../../config/boot',  __FILE__)
+require 'commands/runner'

diff --git a/script/server b/script/server
index dfabcb88128f41f0fdab1711b696274e166f8bc0..b9fcb71793539daffc7f8a9587e8f3fa3026dd48 100755 (executable)
--- 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'