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 11:00:17 -0800 |
| commit | 81f14a5433cbba3e7a6088156d9c548bc5c252ea (patch) | |
| tree | 37ac41ad913fdf593e631c5e6d83839e05744ae6 /actionpack/lib | |
| parent | 60cb7d6af0dac91e0c8788eaa1543f8fe94dfe57 (diff) | |
| download | rails-81f14a5433cbba3e7a6088156d9c548bc5c252ea.tar.gz rails-81f14a5433cbba3e7a6088156d9c548bc5c252ea.tar.bz2 rails-81f14a5433cbba3e7a6088156d9c548bc5c252ea.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/lib')
| -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 43405f3db9..3bf8571d11 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 |