diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-31 10:57:24 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-31 10:57:24 -0800 |
| commit | 77c6706dad7a53bf57d5c6e3980e94ea40b603eb (patch) | |
| tree | 002c171a109760dc8c0aba7750f5106aae99ef61 /actionpack | |
| parent | d9c48626f9b1349e7acb496ba32be9bfaf4625da (diff) | |
| parent | c11e78c1b6655fd42f624b2bd62ebb801284b531 (diff) | |
| download | rails-77c6706dad7a53bf57d5c6e3980e94ea40b603eb.tar.gz rails-77c6706dad7a53bf57d5c6e3980e94ea40b603eb.tar.bz2 rails-77c6706dad7a53bf57d5c6e3980e94ea40b603eb.zip | |
Merge pull request #4735 from arton/master
Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index f3547359cd..2e92fe416b 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -6,7 +6,11 @@ namespace :assets do groups = ENV['RAILS_GROUPS'] || 'assets' args = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"] args << "--trace" if Rake.application.options.trace - fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args) + if $0 =~ /rake\.bat\Z/i + Kernel.exec $0, *args + else + fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args) + end end # We are currently running with no explicit bundler group |