deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-06-20 06:25:04 +02:00
Code Issues Projects 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('---- Executing: $ ' . $command);
ob_start();
$return = 1;
$log = array();
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
. ' && '
. 'chown -h ' . $userGroup . ' ' . $symlink;
. 'chown -h ' . $userGroup . ' ' . $symlink;
$result = $this->_runRemoteCommand($command);
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']);
switch ($this->_source['type']) {
case 'git':
$command = 'cd ' . $this->_source['temporal']
. ' && '
. 'git clone ' . $this->_source['repository'] . ' . '
. ' && '
// Clone Repo
$command = 'cd ' . $this->_source['temporal'] . ' ; '
. 'git clone ' . $this->_source['repository'] . ' . ';
$result = $this->_runLocalCommand($command);
// Checkout Branch
$command = 'cd ' . $this->_source['temporal'] . ' ; '
. 'git checkout ' . $this->_source['from'];
$result = $result && $this->_runLocalCommand($command);
$this->_config->setFrom($this->_source['temporal']);
break;
@ -41,8 +46,6 @@ class Mage_Task_BuiltIn_Scm_Clone
return false;
break;
}
$result = $this->_runLocalCommand($command);
return $result;
}

2
Mage/Task/TaskAbstract.php
View file

@ -45,7 +45,7 @@ abstract class Mage_Task_TaskAbstract
$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() . ' '
. '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && '
. $command . '"';