aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments/boot.rb
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2005-10-15 22:55:52 +0000
committerNicholas Seckar <nseckar@gmail.com>2005-10-15 22:55:52 +0000
commitb7801ff71e80e3d8fb06f93b7cbb6d6916657114 (patch)
tree349452dccc3c64804ed50504ce1e40ad9189a6c9 /railties/environments/boot.rb
parentbfbf6bba1fe45dad35d57afa4e46b0106ea164ab (diff)
downloadrails-b7801ff71e80e3d8fb06f93b7cbb6d6916657114.tar.gz
rails-b7801ff71e80e3d8fb06f93b7cbb6d6916657114.tar.bz2
rails-b7801ff71e80e3d8fb06f93b7cbb6d6916657114.zip
Shorten long line
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2628 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments/boot.rb')
-rw-r--r--railties/environments/boot.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb
index bc075ed09b..9e35fb6c15 100644
--- a/railties/environments/boot.rb
+++ b/railties/environments/boot.rb
@@ -1,5 +1,8 @@
+unless defined?(RAILS_ROOT)
require 'pathname'
-RAILS_ROOT = Pathname.new(File.join(File.dirname(__FILE__), '..')).cleanpath.to_s + '/' unless defined?(RAILS_ROOT)
+ root_path = Pathname.new(File.join(File.dirname(__FILE__), '..'))
+ RAILS_ROOT = root_path.cleanpath.to_s + '/'
+end
if File.directory?("#{RAILS_ROOT}/vendor/rails")
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"