Merge pull request #195 from spongeben/fix-rsync-deploy

Fix 1st deploy bug

Mage/Task/BuiltIn/Deployment/ReleaseTask.php

@@ -74,12 +74,13 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
                 }
             }
 
-            if ($resultFetch && $userGroup != '') {  
-                $command = 'chown -h ' . $userGroup . ' ' . $symlink
-                    . ' && '
-                    . 'chown -R ' . $userGroup . ' ' . $currentCopy
+            if ($resultFetch && $userGroup != '') {
+                $command = 'chown -R ' . $userGroup . ' ' . $currentCopy
                     . ' && '
                     . 'chown ' . $userGroup . ' ' . $releasesDirectory;
+                if (file_exists($symlink)) {
+                    $command.= ' && ' . 'chown -h ' . $userGroup . ' ' . $symlink;
+                }
                 $result = $this->runCommandRemote($command);
                 if (!$result) {
                     return $result;

Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php

@@ -73,11 +73,13 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
                 // rsync: { copy: yes }
                 $rsync_copy = $this->getConfig()->deployment('rsync');
                 // If copy_tool_rsync, use rsync rather than cp for finer control of what is copied
-                if ($rsync_copy && is_array($rsync_copy) && $rsync_copy['copy'] && isset($rsync_copy['copy_tool_rsync'])) {
-                    $this->runCommandRemote("rsync -a {$this->excludes(array_merge($excludes, $rsync_copy['rsync_excludes']))} "
+                if ($rsync_copy && is_array($rsync_copy) && $rsync_copy['copy'] && is_dir("$releasesDirectory/$currentRelease")) {
+                    if (isset($rsync_copy['copy_tool_rsync'])) {
+                        $this->runCommandRemote("rsync -a {$this->excludes(array_merge($excludes, $rsync_copy['rsync_excludes']))} "
                                           . "$releasesDirectory/$currentRelease/ $releasesDirectory/{$this->getConfig()->getReleaseId()}");
-                } elseif ($rsync_copy && is_array($rsync_copy) && $rsync_copy['copy']) {
-                    $this->runCommandRemote('cp -R ' . $releasesDirectory . '/' . $currentRelease . ' ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
+                    } else {
+                        $this->runCommandRemote('cp -R ' . $releasesDirectory . '/' . $currentRelease . ' ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
+                    }
                 } else {
                     $this->runCommandRemote('mkdir -p ' . $releasesDirectory . '/' . $this->getConfig()->getReleaseId());
                 }