From b869876c26059b63ff496733723076cb0424b5f8 Mon Sep 17 00:00:00 2001 From: woutersioen Date: Wed, 16 Jul 2014 17:06:00 +0200 Subject: [PATCH] Refactor tar gz to reuse function. --- .../BuiltIn/Deployment/Strategy/TarGzTask.php | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php b/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php index eae35bb..34a8034 100644 --- a/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php +++ b/Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php @@ -75,25 +75,11 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware $result = $this->runCommandLocal($command) && $result; // Extract Tar Gz - if ($this->getConfig()->release('enabled', false) == true) { - $releasesDirectory = $this->getConfig()->release('directory', 'releases'); - - $deployToDirectory = $releasesDirectory . '/' . $this->getConfig()->getReleaseId(); - $command = 'cd ' . $deployToDirectory . ' && tar xfz ' . $remoteTarGz . '.tar.gz'; - } else { - $command = 'tar xfz ' . $remoteTarGz . '.tar.gz'; - } + $this->getReleasesAwareCommand('tar xfz ' . $remoteTarGz . '.tar.gz'); $result = $this->runCommandRemote($command) && $result; // Delete Tar Gz from Remote Host - if ($this->getConfig()->release('enabled', false) == true) { - $releasesDirectory = $this->getConfig()->release('directory', 'releases'); - - $deployToDirectory = $releasesDirectory . '/' . $this->getConfig()->getReleaseId(); - $command = 'rm ' . $deployToDirectory . '/' . $remoteTarGz . '.tar.gz'; - } else { - $command = 'rm ' . $remoteTarGz . '.tar.gz'; - } + $this->getReleasesAwareCommand('rm ' . $remoteTarGz . '.tar.gz'); $result = $this->runCommandRemote($command) && $result; // Delete Tar Gz from Local @@ -137,4 +123,4 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware return $result; } -} \ No newline at end of file +}