hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 12:40:18 +02:00
Code Issues Releases Wiki Activity

Fixes and tweaks on command execution.

Browse Source
This commit is contained in:
Andrs Montaez 2012-02-12 15:40:56 -02:00
parent 5359a7afbd
commit 949750fc1e
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mage/Console.php
View File

@ -83,8 +83,7 @@ class Mage_Console
{ {
self::log('---------------------------------'); self::log('---------------------------------');
self::log('---- Executing: $ ' . $command); self::log('---- Executing: $ ' . $command);
ob_start();
$return = 1; $return = 1;
$log = array(); $log = array();
exec($command . ' 2>&1', $log, $return); exec($command . ' 2>&1', $log, $return);

2
Mage/Task/BuiltIn/Deployment/Releases.php
View File

@ -22,7 +22,7 @@ class Mage_Task_BuiltIn_Deployment_Releases
. ' && ' . ' && '
. 'ln -sf ' . $currentCopy . ' ' . $symlink . 'ln -sf ' . $currentCopy . ' ' . $symlink
. ' && ' . ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink; . 'chown -h ' . $userGroup . ' ' . $symlink;
$result = $this->_runRemoteCommand($command); $result = $this->_runRemoteCommand($command);
return $result; return $result;

15
Mage/Task/BuiltIn/Scm/Clone.php
View File

@ -29,11 +29,16 @@ class Mage_Task_BuiltIn_Scm_Clone
$this->_runLocalCommand('mkdir -p ' . $this->_source['temporal']); $this->_runLocalCommand('mkdir -p ' . $this->_source['temporal']);
switch ($this->_source['type']) { switch ($this->_source['type']) {
case 'git': case 'git':
$command = 'cd ' . $this->_source['temporal'] // Clone Repo
. ' && ' $command = 'cd ' . $this->_source['temporal'] . ' ; '
. 'git clone ' . $this->_source['repository'] . ' . ' . 'git clone ' . $this->_source['repository'] . ' . ';
. ' && ' $result = $this->_runLocalCommand($command);
// Checkout Branch
$command = 'cd ' . $this->_source['temporal'] . ' ; '
. 'git checkout ' . $this->_source['from']; . 'git checkout ' . $this->_source['from'];
$result = $result && $this->_runLocalCommand($command);
$this->_config->setFrom($this->_source['temporal']); $this->_config->setFrom($this->_source['temporal']);
break; break;
@ -41,8 +46,6 @@ class Mage_Task_BuiltIn_Scm_Clone
return false; return false;
break; break;
} }
$result = $this->_runLocalCommand($command);
return $result; return $result;
} }

2
Mage/Task/TaskAbstract.php
View File

@ -45,7 +45,7 @@ abstract class Mage_Task_TaskAbstract
$releasesDirectory = ''; $releasesDirectory = '';
} }
$localCommand = 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' $localCommand = 'ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '
. $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' ' . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' '
. '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && ' . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
. $command . '"'; . $command . '"';