From 7747193c899aff82b4ee80a8b480ec5373a3ab68 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Fri, 16 Mar 2018 06:49:35 +0700 Subject: [PATCH] Fixed project directory for Build::writeSshKey and Build::writeSshWrapper. Issue #165. --- src/Model/Build.php | 4 ++-- src/Model/Build/GitBuild.php | 2 +- src/Model/Build/HgBuild.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Model/Build.php b/src/Model/Build.php index 207c4611..166ad6c4 100644 --- a/src/Model/Build.php +++ b/src/Model/Build.php @@ -472,7 +472,7 @@ class Build extends BaseBuild */ protected function writeSshKey($cloneTo) { - $keyPath = dirname($cloneTo . '/temp'); + $keyPath = $cloneTo . 'temp'; $keyFile = $keyPath . '.key'; file_put_contents($keyFile, $this->getProject()->getSshPrivateKey()); @@ -491,7 +491,7 @@ class Build extends BaseBuild */ protected function writeSshWrapper($cloneTo, $keyFile) { - $path = dirname($cloneTo . '/temp'); + $path = $cloneTo . 'temp'; $wrapperFile = $path . '.sh'; $sshFlags = '-o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no'; diff --git a/src/Model/Build/GitBuild.php b/src/Model/Build/GitBuild.php index 40ecf59c..82e64094 100644 --- a/src/Model/Build/GitBuild.php +++ b/src/Model/Build/GitBuild.php @@ -109,7 +109,7 @@ class GitBuild extends Build } $cmd .= ' -b "%s" "%s" "%s"'; - $cmd = 'export GIT_SSH="'.$gitSshWrapper.'" && ' . $cmd; + $cmd = 'export GIT_SSH="' . $gitSshWrapper . '" && ' . $cmd; $success = $builder->executeCommand($cmd, $this->getBranch(), $this->getCloneUrl(), $cloneTo); diff --git a/src/Model/Build/HgBuild.php b/src/Model/Build/HgBuild.php index 7073144e..b084bbd1 100644 --- a/src/Model/Build/HgBuild.php +++ b/src/Model/Build/HgBuild.php @@ -63,7 +63,7 @@ class HgBuild extends Build $keyFile = $this->writeSshKey($cloneTo); // Do the hg clone: - $cmd = 'hg clone --ssh "ssh -i '.$keyFile.'" %s "%s" -r %s'; + $cmd = 'hg clone --ssh "ssh -i ' . $keyFile . '" %s "%s" -r %s'; $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo, $this->getBranch()); if ($success) {