lib/ash/drupal.rb in capistrano-ash-1.1.7 vs lib/ash/drupal.rb in capistrano-ash-1.1.8

@@ -15,21 +15,27 @@
   set :drush_bin, "drush"
 
   # --------------------------------------------
   # Calling our Methods
   # --------------------------------------------
-  after "deploy:setup", "deploy:setup_shared"
+  after "deploy:setup", "deploy:setup_local"
   after "deploy:finalize_update", "ash:fixperms"
   after "deploy:symlink", "drupal:symlink"
   after "drupal:symlink","drupal:protect"
   after "deploy", "drupal:clearcache"
   after "deploy", "deploy:cleanup"
 
   # --------------------------------------------
   # Overloaded Methods
   # --------------------------------------------
   namespace :deploy do
+    desc "Setup local files necessary for deployment"
+    task :setup_local do
+      # attempt to create files needed for proper deployment
+      system("cp .htaccess htaccess.dist")
+    end
+    
     desc "Setup shared application directories and permissions after initial setup"
     task :setup_shared, :roles => :web do
       # remove Capistrano specific directories
       run "rm -Rf #{shared_path}/log"
       run "rm -Rf #{shared_path}/pids"
@@ -141,13 +147,8 @@
     desc "Protect system files"
     task :protect, :except => { :no_release => true } do
       multisites.each_pair do |folder, url|
         run "chmod 644 #{latest_release}/sites/#{url}/settings.php*"
       end
-    end
-  
-    desc 'Copy over htaccess file'
-    task :htaccess do
-      run "cp #{latest_release}/htaccess.dist #{latest_release}/.htaccess"
     end
   end
 end