Permalink
Browse files

Revert "Revert "only bundle in node for execjs based apps""

This reverts commit 2452eaf.
  • Loading branch information...
1 parent 3da296d commit 5a468652c794224160542e8b3764f94d59b52868 @hone hone committed Jul 18, 2011
Showing with 3 additions and 2 deletions.
  1. +2 −1 lib/language_pack/rails3.rb
  2. +1 −1 lib/language_pack/ruby.rb
@@ -36,7 +36,8 @@ def plugins
end
def binaries
- super + ['node/node-0.4.7/node']
+ node = gem_is_bundled?('execjs') ? ['node/node-0.4.7/node'] : []
+ super + node
end
def run_assets_precompile_task
@@ -30,11 +30,11 @@ def default_process_types
def compile
Dir.chdir(build_path)
- install_binaries
setup_language_pack_environment
git_dir = ENV.delete("GIT_DIR") # can mess with bundler
build_bundler
create_database_yml
+ install_binaries
run_compile_hook
ENV["GIT_DIR"] = git_dir
end

0 comments on commit 5a46865

Please sign in to comment.