Skip to content

Commit

Permalink
Added fix for cases when scriptsdir.includes is not present in the de…
Browse files Browse the repository at this point in the history
…ployment.properties file and scriptsdir is present in deployment.xml.

Fix for issue #35.
  • Loading branch information
Slavey Karadzhov committed Jun 23, 2014
1 parent 93ebf2c commit 81a9c78
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion module/Client/src/Client/Service/ZpkInvokable.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,15 @@ public function pack($sourceFolder, $destinationFolder=".", $fileName=null, arra
$folderMap['appdir.includes'] = '';
} else {
$folderMap['appdir.includes'] = $appDir;
if (isset($xml->scriptsdir)) {
if ($scriptsDir) {
$folderMap['scriptsdir.includes'] = $scriptsDir;
}
}

if(isset($folderMap['scriptsdir.includes']) && !isset($properties['scriptsdir.includes'])) {
$properties['scriptsdir.includes'] = array ($scriptsDir);
}

ErrorHandler::start();
foreach ($folderMap as $key => $baseDir) {
$excludes = array();
Expand Down

0 comments on commit 81a9c78

Please sign in to comment.