mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
boot.rb sets RAILS_ROOT, so remove that. Install http plugins inside a Dir.chdir block so that the cwd doesn't change
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6248 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
81ae38580b
commit
88876163f9
1 changed files with 6 additions and 6 deletions
|
@ -240,12 +240,13 @@ class Plugin
|
||||||
def install_using_http(options = {})
|
def install_using_http(options = {})
|
||||||
root = rails_env.root
|
root = rails_env.root
|
||||||
mkdir_p "#{root}/vendor/plugins"
|
mkdir_p "#{root}/vendor/plugins"
|
||||||
Dir.chdir "#{root}/vendor/plugins"
|
Dir.chdir "#{root}/vendor/plugins" do
|
||||||
puts "fetching from '#{uri}'" if $verbose
|
puts "fetching from '#{uri}'" if $verbose
|
||||||
fetcher = RecursiveHTTPFetcher.new(uri)
|
fetcher = RecursiveHTTPFetcher.new(uri)
|
||||||
fetcher.quiet = true if options[:quiet]
|
fetcher.quiet = true if options[:quiet]
|
||||||
fetcher.fetch
|
fetcher.fetch
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def svn_command(cmd, options = {})
|
def svn_command(cmd, options = {})
|
||||||
root = rails_env.root
|
root = rails_env.root
|
||||||
|
@ -914,5 +915,4 @@ class RecursiveHTTPFetcher
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
RAILS_ROOT = RailsEnvironment.default.root unless Object.const_defined?(:RAILS_ROOT)
|
|
||||||
Commands::Plugin.parse!
|
Commands::Plugin.parse!
|
||||||
|
|
Loading…
Reference in a new issue