From 7d48364a9a06217f53a94d6fcff7839346df4aa1 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 10 Apr 2018 17:08:47 +0000 Subject: [PATCH] --- .../class.ws.packager.mac.exe.html.php | 2 +- inc/ws/Util/packager/class.ws.packager.php | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) 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 c2be4bca2..00f8e7f9f 100644 --- 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 { public function __construct($book_id) { parent::__construct($book_id); - $this->version = 'mac-exe-inst'; + $this->version = 'mac-exe-html'; $this->book->parametres->alwaysHTML5 = true; $this->exeName = cubeText::str2URL(mb_substr($this->book->parametres->title, 0, 30)); diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 50a589f41..d164c8231 100644 --- 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); -- 2.39.5