(no commit message)

diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
index c2be4bca22e0aeae72719f8cace6297b6245b791..00f8e7f9f8c200607faae2599877a1852163b1a2 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
@@ -6,7 +6,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML {
 \r
        public function __construct($book_id) {\r
                parent::__construct($book_id);\r
-               $this->version = 'mac-exe-inst';\r
+               $this->version = 'mac-exe-html';\r
                $this->book->parametres->alwaysHTML5 = true;\r
 \r
                $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30));\r

diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 50a589f4122ec77f55f5603b8011dc90db1ab2cc..d164c8231da49ba1d2af1e93a9e51a302664c659 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -177,15 +177,18 @@ class wsPackager {
                        $rename = true;
                }
 
-               $zip = new cubeCommandLine('zip');
-               $zip->cd($this->getFinalPackageDir());
-               $zip->setArg(null, $zipfile);
-               $zip->setArg('symlinks');
-               $zip->setArg('0');
-               $zip->setArg('r');
-               $zip->setArg('u');
-               $zip->setArg(null, '.');
-               $zip->execute();
+               $dir=$this->getFinalPackageDir();
+               if(file_exists($dir)) {
+            $zip = new cubeCommandLine('zip');
+            $zip->cd($dir);
+            $zip->setArg(null, $zipfile);
+            $zip->setArg('symlinks');
+            $zip->setArg('0');
+            $zip->setArg('r');
+            $zip->setArg('u');
+            $zip->setArg(null, '.');
+            $zip->execute();
+        }
 
                if (!file_exists(WS_FILES . '/packager/download')) {
                        mkdir(WS_FILES . '/packager/download', 0777, true);