hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-10-31 15:20:17 +01:00
Code Issues Releases Wiki Activity

[Nostromo] Apply Mess Detector recommendations

Browse Source
This commit is contained in:
Andrés Montañez 2017-01-11 21:30:12 -03:00
parent c9ec69e385
commit 949ca7c625
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Runtime/Runtime.php
View File

@ -418,7 +418,7 @@ class Runtime
* @param int $timeout Seconds to wait * @param int $timeout Seconds to wait
* @return Process * @return Process
*/ */
public function runRemoteCommand($cmd, $jail = true, $timeout = 120) public function runRemoteCommand($cmd, $jail, $timeout = 120)
{ {
$user = $this->getEnvParam('user'); $user = $this->getEnvParam('user');
$sudo = $this->getEnvParam('sudo', false); $sudo = $this->getEnvParam('sudo', false);
@ -430,13 +430,11 @@ class Runtime
$cmdDelegate = sprintf('sudo %s', $cmd); $cmdDelegate = sprintf('sudo %s', $cmd);
} }
if ($jail) { $hostPath = rtrim($this->getEnvParam('host_path'), '/');
$hostPath = rtrim($this->getEnvParam('host_path'), '/'); if ($jail && $this->getReleaseId()) {
if ($this->getReleaseId()) { $cmdDelegate = sprintf('cd %s/releases/%s && %s', $hostPath, $this->getReleaseId(), $cmdDelegate);
$cmdDelegate = sprintf('cd %s/releases/%s && %s', $hostPath, $this->getReleaseId(), $cmdDelegate); } elseif ($jail) {
} else { $cmdDelegate = sprintf('cd %s && %s', $hostPath, $cmdDelegate);
$cmdDelegate = sprintf('cd %s && %s', $hostPath, $cmdDelegate);
}
} }
$cmdRemote = str_replace(['"', '&', ';', '|'], ['\"', '\&', '\;', '\|'], $cmdDelegate); $cmdRemote = str_replace(['"', '&', ';', '|'], ['\"', '\&', '\;', '\|'], $cmdDelegate);