diff --git a/Mage/Task/BuiltIn/Deployment/Rsync.php b/Mage/Task/BuiltIn/Deployment/Rsync.php index 07e0bc4..d21ad23 100644 --- a/Mage/Task/BuiltIn/Deployment/Rsync.php +++ b/Mage/Task/BuiltIn/Deployment/Rsync.php @@ -39,7 +39,7 @@ class Mage_Task_BuiltIn_Deployment_Rsync . '--rsh="ssh -p' . $this->_config->getHostPort() . '" ' . $this->_excludes(array_merge($excludes, $userExcludes)) . ' ' . $this->_config->deployment('from') . ' ' - . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ':' . $deployToDirectory; + . $this->_config->deployment('user') . '@' . $this->_config->getHostName() . ':' . $deployToDirectory; $result = $this->_runLocalCommand($command); diff --git a/Mage/Task/TaskAbstract.php b/Mage/Task/TaskAbstract.php index d8c78b1..894e985 100644 --- a/Mage/Task/TaskAbstract.php +++ b/Mage/Task/TaskAbstract.php @@ -47,7 +47,7 @@ abstract class Mage_Task_TaskAbstract $localCommand = 'ssh -p ' . $this->_config->getHostPort() . ' ' . '-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' - . $this->_config->deployment('user') . '@' . $this->_config->getHost() . ' ' + . $this->_config->deployment('user') . '@' . $this->_config->getHostName() . ' ' . '"cd ' . rtrim($this->_config->deployment('to'), '/') . $releasesDirectory . ' && ' . $command . '"'; diff --git a/bin/mage b/bin/mage index a569d25..6648ba4 100755 --- a/bin/mage +++ b/bin/mage @@ -1,5 +1,5 @@ #!/bin/sh -#VERSION:0.9.5 +#VERSION:0.9.6 SCRIPT=$(readlink -f $0) DIR=$(dirname $SCRIPT) diff --git a/bin/mage.php b/bin/mage.php index 25a306b..7a05b18 100644 --- a/bin/mage.php +++ b/bin/mage.php @@ -24,7 +24,7 @@ date_default_timezone_set('UTC'); $baseDir = dirname(dirname(__FILE__)); -define('MAGALLANES_VERSION', '0.9.5'); +define('MAGALLANES_VERSION', '0.9.6'); require_once $baseDir . '/Mage/spyc.php'; require_once $baseDir . '/Mage/Autoload.php';