Fixes for asset pipeline.0.16.0.4hotfix/0.16.0.4

Remove rake namespace - clashes with rake variable used in precompiling
assets. Make sure the symlinking and theme installation are done before
precompiling assets.

1 files changed, 6 insertions, 7 deletions

diff --git a/config/deploy.rb b/config/deploy.rb
index 3a4f175b4..c73d16f53 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -17,14 +17,13 @@ set :rails_env, configuration['rails_env']
 
 server configuration['server'], :app, :web, :db, :primary => true
 
-namespace :rake do
-  namespace :themes do
-    task :install do
-      run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
-    end
+namespace :themes do
+  task :install do
+    run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
   end
 end
 
+
 # Not in the rake namespace because we're also specifying app-specific arguments here
 namespace :xapian do
   desc 'Rebuilds the Xapian index as per the ./scripts/rebuild-xapian-index script'
@@ -71,8 +70,8 @@ namespace :deploy do
   end
 end
 
-after 'deploy:update_code', 'deploy:symlink_configuration'
-after 'deploy:update_code', 'rake:themes:install'
+before 'deploy:assets:precompile', 'deploy:symlink_configuration'
+before 'deploy:assets:precompile', 'themes:install'
 
 # Put up a maintenance notice if doing a migration which could take a while
 before 'deploy:migrate', 'deploy:web:disable'