deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed wipe feature by moving the wildcard '*' out of the quotes to prevent escaping of the wildcard character

Browse source
This commit is contained in:
Stefan Rausch 2015-05-08 08:43:03 +02:00
commit dcc7799e79
1 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

34
PHPCI/Plugin/CopyBuild.php
View file

@ -26,7 +26,6 @@ class CopyBuild implements \PHPCI\Plugin
protected $wipe;
protected $phpci;
protected $build;
protected $symlink;
/**
* Set up the plugin, configure options, etc.
@ -42,7 +41,6 @@ class CopyBuild implements \PHPCI\Plugin
$this->directory = isset($options['directory']) ? $options['directory'] : $path;
$this->wipe = isset($options['wipe']) ? (bool)$options['wipe'] : false;
$this->ignore = isset($options['respect_ignore']) ? (bool)$options['respect_ignore'] : false;
$this->symlink = isset($options['symlink_to_current']) ? $options['symlink_to_current'] : false;
}
/**
@ -67,10 +65,6 @@ class CopyBuild implements \PHPCI\Plugin
$this->deleteIgnoredFiles();
if ($success && $this->symlink) {
$success = $this->createSymlinkToCurrentBuild();
}
return $success;
}
@ -81,7 +75,7 @@ class CopyBuild implements \PHPCI\Plugin
protected function wipeExistingDirectory()
{
if ($this->wipe === true && $this->directory != '/' && is_dir($this->directory)) {
$cmd = 'rm -Rf %s*';
$cmd = 'rm -Rf "%s"*';
$success = $this->phpci->executeCommand($cmd, $this->directory);
if (!$success) {
@ -105,30 +99,4 @@ class CopyBuild implements \PHPCI\Plugin
}
}
}
/**
* Create symlink to current copy of build directory.
* Info: Does not work on windows systems.
* @return boolean
*/
protected function createSymlinkToCurrentBuild()
{
$success = true;
if (!IS_WIN) {
$cmd = 'rm "%s" && ln -s "%s" "%s"';
$dir = rtrim($this->directory, '/') . '/';
$this->phpci->log('Try to create symlink: '.$this->symlink.' --> '.$dir.$this->build->getId());
$success = $this->phpci->executeCommand($cmd, $this->symlink, $dir.$this->build->getId(), $this->symlink);
if (!$success) {
$this->phpci->logFailure('Unable to create symlink: '.$this->symlink.' --> '.$dir.$this->build->getId());
} else {
$this->phpci->log('Symlink successfully created.');
}
}
return $success;
}
}