tonyair
/
silverstripe-staticpublisher
mirror of https://github.com/silverstripe/silverstripe-staticpublisher
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #45 from Ben-Speakman/patch-1 

Fix RsyncMultiHostPublisher config loading error
This commit is contained in:
Will Rossiter 2015-05-19 10:02:44 +12:00
parent 136cfea039 8e24d17efd
commit 937a3b5606
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/extensions/RsyncMultiHostPublisher.php
View File

@ -65,11 +65,13 @@ class RsyncMultiHostPublisher extends FilesystemPublisher {
if(isset($_GET['norsync']) && $_GET['norsync']) return;
$extraArg = "";
if($this->config()->excluded_folders) foreach($this->config()->excluded_folders as $folder) {
$excludedFolders = Config::inst()->get('RsyncMultiHostPublisher', 'excluded_folders');
if($excludedFolders) foreach($excludedFolders as $folder) {
$extraArg .= " --exclude " . escapeshellarg($folder);
}
foreach((array)$this->config()->targets as $target) {
$targets = Config::inst()->get('RsyncMultiHostPublisher', 'targets');
foreach((array)$targets as $target) {
// Transfer non-PHP content from everything to the target; that will ensure that we have all the JS/CSS/etc
$rsyncOutput = `cd $base; rsync -av -e ssh --exclude /.htaccess --exclude /web.config --exclude '*.php' --exclude '*.svn' --exclude '*.git' --exclude '*~' $extraArg --delete . $target`;
// Then transfer "safe" PHP from the cache/ directory