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 00ae734..61112a0 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 64af76e..d7db15a 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 42f28f7..235a1f2 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 caa60ce..83c8436 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 fa0e6fc..88d295f 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 ef976e0..62a8a4c 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 c842d35..3bff809 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 d855ac8..0764057 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 ae3f38c..489e568 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 26ca64c..b82201f 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 bf25ad8..8bcabb0 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 c77f045..aa7c1a0 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 7118f39..69b3359 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 6816b32..190c2be 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 ccc30f9..be4c5d4 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 dfabcb8..b9fcb71 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'