From 81a9c7890524e284fa4b71584ee3c3bd28f82418 Mon Sep 17 00:00:00 2001
From: Slavey Karadzhov <slavey.karadzhov@zend.com>
Date: Mon, 23 Jun 2014 10:52:42 +0200
Subject: [PATCH] Added fix for cases when scriptsdir.includes is not present
 in the deployment.properties file and scriptsdir is present in
 deployment.xml. Fix for issue #35.

---
 module/Client/src/Client/Service/ZpkInvokable.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/Client/src/Client/Service/ZpkInvokable.php b/module/Client/src/Client/Service/ZpkInvokable.php
index aa81c6f..2628e84 100644
--- a/module/Client/src/Client/Service/ZpkInvokable.php
+++ b/module/Client/src/Client/Service/ZpkInvokable.php
@@ -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();