diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-25 12:55:01 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-25 12:55:01 +0100 |
commit | c6b16fc2aada37aab1949cd9a1e46a2d9ccc8381 (patch) | |
tree | ea13a4e420a94ed7b552529ca9dc4b02680203d2 /railties/bin | |
parent | f2d65a456fd93fd3a220f85c1001f0180bfdd6be (diff) | |
parent | 0c68d23f19010379a9320690ca17a26743c8f071 (diff) | |
download | rails-c6b16fc2aada37aab1949cd9a1e46a2d9ccc8381.tar.gz rails-c6b16fc2aada37aab1949cd9a1e46a2d9ccc8381.tar.bz2 rails-c6b16fc2aada37aab1949cd9a1e46a2d9ccc8381.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/bin')
-rwxr-xr-x | railties/bin/about | 4 | ||||
-rwxr-xr-x | railties/bin/console | 2 | ||||
-rwxr-xr-x | railties/bin/dbconsole | 2 | ||||
-rwxr-xr-x | railties/bin/destroy | 2 | ||||
-rwxr-xr-x | railties/bin/generate | 2 | ||||
-rwxr-xr-x | railties/bin/performance/benchmarker | 2 | ||||
-rwxr-xr-x | railties/bin/performance/profiler | 2 | ||||
-rwxr-xr-x | railties/bin/plugin | 2 | ||||
-rwxr-xr-x | railties/bin/runner | 2 | ||||
-rwxr-xr-x | railties/bin/server | 2 |
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' |