Ruby 1.9.2 compat: Use File#expand_path for require path because "." will not be included in LOAD_PATH since Ruby 1.9.2 [#2921 state:resolved]

Signed-off-by: Yehuda Katz <wycats@gmail.com>

10 files changed, 11 insertions, 11 deletions

diff --git a/railties/bin/about b/railties/bin/about
index ed8deb0dfc..1eeb6eb915 100755
--- a/railties/bin/about
+++ b/railties/bin/about
@@ -1,4 +1,4 @@
 #!/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'
\ No newline at end of file
+require 'commands/about'
diff --git a/railties/bin/console b/railties/bin/console
index 498077ab33..235a1f2780 100755
--- a/railties/bin/console
+++ b/railties/bin/console
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/console'
diff --git a/railties/bin/dbconsole b/railties/bin/dbconsole
index caa60ce829..83c8436a9d 100755
--- a/railties/bin/dbconsole
+++ b/railties/bin/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/railties/bin/destroy b/railties/bin/destroy
index a4df765a39..88d295f7aa 100755
--- a/railties/bin/destroy
+++ b/railties/bin/destroy
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/destroy'
diff --git a/railties/bin/generate b/railties/bin/generate
index 173a9f147d..62a8a4c0c5 100755
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/generate'
diff --git a/railties/bin/performance/benchmarker b/railties/bin/performance/benchmarker
index c842d35d33..3bff809fb3 100755
--- a/railties/bin/performance/benchmarker
+++ b/railties/bin/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/railties/bin/performance/profiler b/railties/bin/performance/profiler
index d855ac8b13..07640575cd 100755
--- a/railties/bin/performance/profiler
+++ b/railties/bin/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/railties/bin/plugin b/railties/bin/plugin
index 87cd2070fe..b82201fa83 100755
--- a/railties/bin/plugin
+++ b/railties/bin/plugin
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/plugin'
diff --git a/railties/bin/runner b/railties/bin/runner
index a4a7cb25ba..be4c5d4572 100755
--- a/railties/bin/runner
+++ b/railties/bin/runner
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/runner'
diff --git a/railties/bin/server b/railties/bin/server
index 3c67f39b69..b9fcb71793 100755
--- a/railties/bin/server
+++ b/railties/bin/server
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/server'